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

Closed memory leak about boot catalog node.

Browse Source
This commit is contained in:
Thomas Schmitt 2010-04-25 20:27:17 +02:00
parent 03b030c56d
commit 3d9367d52a
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libisofs/builder.c
View File

@ -20,7 +20,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <limits.h> #include <limits.h>
#include <stdio.h>
#ifndef PATH_MAX #ifndef PATH_MAX
#define PATH_MAX Libisofs_default_path_maX #define PATH_MAX Libisofs_default_path_maX
@ -100,7 +100,7 @@ int default_create_node(IsoNodeBuilder *builder, IsoImage *image,
IsoNode *new; IsoNode *new;
IsoFilesystem *fs; IsoFilesystem *fs;
char *name; char *name;
unsigned char *aa_string; unsigned char *aa_string = NULL;
char *a_text = NULL, *d_text = NULL; char *a_text = NULL, *d_text = NULL;
if (builder == NULL || src == NULL || node == NULL) { if (builder == NULL || src == NULL || node == NULL) {
@ -217,6 +217,9 @@ int default_create_node(IsoNodeBuilder *builder, IsoImage *image,
} }
iso_aa_get_acl_text(aa_string, info.st_mode, &a_text, &d_text, iso_aa_get_acl_text(aa_string, info.st_mode, &a_text, &d_text,
1 << 15); /* free ACL texts */ 1 << 15); /* free ACL texts */
if(aa_string != NULL)
free(aa_string);
aa_string = NULL;
} }
/* Obtain ownership of eventual AAIP string */ /* Obtain ownership of eventual AAIP string */
@ -227,6 +230,8 @@ int default_create_node(IsoNodeBuilder *builder, IsoImage *image,
ret = iso_node_add_xinfo(new, aaip_xinfo_func, aa_string); ret = iso_node_add_xinfo(new, aaip_xinfo_func, aa_string);
if (ret < 0) if (ret < 0)
return ret; return ret;
} else if(aa_string != NULL) {
free(aa_string);
} }
*node = new; *node = new;

9
libisofs/eltorito.c
View File

@ -620,10 +620,13 @@ void iso_image_remove_boot_image(IsoImage *image)
return; return;
/* /*
* remove catalog node from its parent * remove catalog node from its parent and dispose it
* (the reference will be disposed next) * (another reference is with the catalog)
*/ */
iso_node_take((IsoNode*)image->bootcat->node); if (iso_node_get_parent((IsoNode*) image->bootcat->node) != NULL) {
iso_node_take((IsoNode*) image->bootcat->node);
iso_node_unref((IsoNode*) image->bootcat->node);
}
/* free boot catalog and image, including references to nodes */ /* free boot catalog and image, including references to nodes */
el_torito_boot_catalog_free(image->bootcat); el_torito_boot_catalog_free(image->bootcat);