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

Prevent memory leak in case of failure.

Browse Source
This commit is contained in:
Vreixo Formoso 2008-01-12 17:32:16 +01:00
parent 8115ba6c24
commit 25f4402147
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util.c
View File

@ -57,7 +57,7 @@ int strconv(const char *str, const char *icharset, const char *ocharset,
inbytes = strlen(str); inbytes = strlen(str);
outbytes = (inbytes + 1) * MB_LEN_MAX; outbytes = (inbytes + 1) * MB_LEN_MAX;
out = malloc(outbytes); out = alloca(outbytes);
if (out == NULL) { if (out == NULL) {
return ISO_MEM_ERROR; return ISO_MEM_ERROR;
} }
@ -78,7 +78,11 @@ int strconv(const char *str, const char *icharset, const char *ocharset,
*ret = '\0'; *ret = '\0';
iconv_close(conv); iconv_close(conv);
*output = realloc(out, ret - out + 1); *output = malloc(ret - out + 1);
if (*output == NULL) {
return ISO_MEM_ERROR;
}
memcpy(*output, out, ret - out + 1);
return ISO_SUCCESS; return ISO_SUCCESS;
} }