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

Corrected several memory leaks and potential NULL pointer evaluations

Browse Source 
in case of memory shortage. All reported by George Danchev.
This commit is contained in:
Thomas Schmitt
2010-09-01 10:45:10 +02:00
parent e1888df5ab
commit ba11413a6f
8 changed files with 98 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libisofs/util_rbtree.c
View File

@ -285,7 +285,7 @@ void ** iso_rbtree_to_array(IsoRBTree *tree, int (*include_item)(void *),
size_t *size)
{
size_t pos;
void **array;
void **array, **new_array;
array = malloc((tree->size + 1) * sizeof(void*));
if (array == NULL) {
@ -296,7 +296,11 @@ void ** iso_rbtree_to_array(IsoRBTree *tree, int (*include_item)(void *),
pos = rbtree_to_array_aux(tree->root, array, 0, include_item);
array[pos] = NULL;
array = realloc(array, (pos + 1) * sizeof(void*));
new_array = realloc(array, (pos + 1) * sizeof(void*));
if (new_array == NULL) {
free((char *) array);
return NULL;
}
if (size) {
*size = pos;
}