opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ntfs_utf16_to_utf8, ntfs_utf8_to_utf16: check ntfs_malloc() return value

master
szaka 2008-12-22 00:16:19 +00:00
parent 704519c75e
commit 2a004f0911
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libntfs-3g/unistr.c
View File

@ -485,8 +485,12 @@ static int ntfs_utf16_to_utf8(const ntfschar *ins, const int ins_len,
if (size < 0)
goto out;
if (!*outs)
*outs = ntfs_malloc((outs_len = size + 1));
if (!*outs) {
outs_len = size + 1;
*outs = ntfs_malloc(outs_len);
if (!*outs)
goto out;
}
t = *outs;
@ -666,8 +670,11 @@ static int ntfs_utf8_to_utf16(const char *ins, ntfschar **outs)
if (shorts < 0)
goto fail;
if (!*outs)
*outs = ntfs_malloc((shorts+1) * sizeof(ntfschar));
if (!*outs) {
*outs = ntfs_malloc((shorts + 1) * sizeof(ntfschar));
if (!*outs)
goto fail;
}
outpos = *outs;