libburnia/libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Closed memory leak with lack of memory during retrieval of HFS+ names.

Browse Source 
Coverity CID 12580.
This commit is contained in:
Thomas Schmitt 2015-10-10 13:11:31 +02:00
parent 05a2171e04
commit 5ac3216933
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libisofs/hfsplus.c
View File

@ -137,8 +137,10 @@ int iso_get_hfsplus_name(char *input_charset, int imgid, char *name,
curlen = ucslen (ucs_name); curlen = ucslen (ucs_name);
*result = calloc ((curlen * HFSPLUS_MAX_DECOMPOSE_LEN + 1), *result = calloc ((curlen * HFSPLUS_MAX_DECOMPOSE_LEN + 1),
sizeof (uint16_t)); sizeof (uint16_t));
if (*result == NULL) if (*result == NULL) {
free(ucs_name);
return ISO_OUT_OF_MEM; return ISO_OUT_OF_MEM;
}
for (iptr = ucs_name, optr = *result; *iptr; iptr++) for (iptr = ucs_name, optr = *result; *iptr; iptr++)
{ {
@ -208,8 +210,12 @@ int iso_get_hfsplus_name(char *input_charset, int imgid, char *name,
while (done); while (done);
*cmp_name = calloc ((ucslen (*result) + 1), sizeof (uint16_t)); *cmp_name = calloc ((ucslen (*result) + 1), sizeof (uint16_t));
if (*cmp_name == NULL) if (*cmp_name == NULL) {
return ISO_OUT_OF_MEM; free(ucs_name);
free(*result);
*result = NULL;
return ISO_OUT_OF_MEM;
}
for (iptr = *result, optr = *cmp_name; *iptr; iptr++) for (iptr = *result, optr = *cmp_name; *iptr; iptr++)
{ {