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

Closed memory leaks opened with rev 487.

Browse Source
This commit is contained in:
Thomas Schmitt 2009-03-21 11:09:14 +01:00
parent 0402325ec2
commit 5f2bde776b
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libisofs/fs_image.c
View File

@ -124,7 +124,7 @@ static int ifs_fs_open(IsoImageFilesystem *fs);
static int ifs_fs_close(IsoImageFilesystem *fs); static int ifs_fs_close(IsoImageFilesystem *fs);
static int iso_file_source_new_ifs(IsoImageFilesystem *fs, static int iso_file_source_new_ifs(IsoImageFilesystem *fs,
IsoFileSource *parent, struct ecma119_dir_record *record, IsoFileSource *parent, struct ecma119_dir_record *record,
IsoFileSource **src, int falg); IsoFileSource **src, int flag);
/** unique identifier for each image */ /** unique identifier for each image */
unsigned int fs_dev_id = 0; unsigned int fs_dev_id = 0;

18
libisofs/util.c
View File

@ -253,7 +253,7 @@ int strconv(const char *str, const char *icharset, const char *ocharset,
goto ex; goto ex;
} }
memcpy(*output, out, ret - out + 1); memcpy(*output, out, ret - out + 1);
return ISO_SUCCESS; retval = ISO_SUCCESS;
ex:; ex:;
@ -341,7 +341,7 @@ int strnconv(const char *str, const char *icharset, const char *ocharset,
goto ex; goto ex;
} }
memcpy(*output, out, ret - out + 1); memcpy(*output, out, ret - out + 1);
return ISO_SUCCESS; retval = ISO_SUCCESS;
ex:; ex:;
@ -971,7 +971,7 @@ char *iso_r_dirid(const char *src, int size, int relaxed)
*/ */
char *iso_r_fileid(const char *src, size_t len, int relaxed, int forcedot) char *iso_r_fileid(const char *src, size_t len, int relaxed, int forcedot)
{ {
char *dot; char *dot, *retval = NULL;
int lname, lext, lnname, lnext, pos, i; int lname, lext, lnname, lnext, pos, i;
#ifdef Libisofs_avoid_using_allocA #ifdef Libisofs_avoid_using_allocA
@ -1067,7 +1067,8 @@ char *iso_r_fileid(const char *src, size_t len, int relaxed, int forcedot)
} }
} }
dest[pos] = '\0'; dest[pos] = '\0';
return strdup(dest);
retval = strdup(dest);
ex:; ex:;
@ -1076,7 +1077,7 @@ ex:;
free(dest); free(dest);
#endif #endif
return NULL; return retval;
} }
uint16_t *iso_j_file_id(const uint16_t *src) uint16_t *iso_j_file_id(const uint16_t *src)
@ -1595,7 +1596,7 @@ void strncpy_pad(char *dest, const char *src, size_t max)
char *ucs2str(const char *buf, size_t len) char *ucs2str(const char *buf, size_t len)
{ {
size_t outbytes, inbytes; size_t outbytes, inbytes;
char *str, *src, *out = NULL; char *str, *src, *out = NULL, *retval = NULL;
#ifdef Libisofs_with_iso_iconV #ifdef Libisofs_with_iso_iconV
struct iso_iconv_handle conv; struct iso_iconv_handle conv;
@ -1657,7 +1658,8 @@ char *ucs2str(const char *buf, size_t len)
/* remove trailing spaces */ /* remove trailing spaces */
for (len = strlen(out) - 1; out[len] == ' ' && len > 0; --len) for (len = strlen(out) - 1; out[len] == ' ' && len > 0; --len)
out[len] = '\0'; out[len] = '\0';
return strdup(out);
retval = strdup(out);
ex:; ex:;
@ -1666,7 +1668,7 @@ ex:;
free(out); free(out);
#endif #endif
return NULL; return retval;
} }
void iso_lib_version(int *major, int *minor, int *micro) void iso_lib_version(int *major, int *minor, int *micro)