utf.c (13.09.09)
exFAT file system implementation library.
- Copyright (C) 2010-2013 Andrew Nayenko
+ Free exFAT implementation.
+ Copyright (C) 2010-2018 Andrew Nayenko
- This program is free software: you can redistribute it and/or modify
+ This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "exfat.h"
char* outp = output;
wchar_t wc;
- while (inp - input < insize && le16_to_cpu(*inp))
+ while (inp - input < insize)
{
inp = utf16_to_wchar(inp, &wc, insize - (inp - input));
if (inp == NULL)
exfat_error("name is too long");
return -ENAMETOOLONG;
}
+ if (wc == 0)
+ return 0;
+ }
+ if (outp - output >= outsize)
+ {
+ exfat_error("name is too long");
+ return -ENAMETOOLONG;
}
*outp = '\0';
return 0;
le16_t* outp = output;
wchar_t wc;
- while (inp - input < insize && *inp)
+ while (inp - input < insize)
{
inp = utf8_to_wchar(inp, &wc, insize - (inp - input));
if (inp == NULL)
exfat_error("name is too long");
return -ENAMETOOLONG;
}
+ if (wc == 0)
+ break;
+ }
+ if (outp - output >= outsize)
+ {
+ exfat_error("name is too long");
+ return -ENAMETOOLONG;
}
*outp = cpu_to_le16(0);
return 0;