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

Fixed several memory problems introduced by rev 965

Browse Source
This commit is contained in:
Thomas Schmitt 2012-05-25 20:57:06 +02:00
parent a72fd6a309
commit 6fc6a09040
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libisofs/image.c
View File

@ -663,6 +663,13 @@ int iso_image_give_up_mips_boot(IsoImage *image, int flag)
return ISO_SUCCESS; return ISO_SUCCESS;
} }
static void unset_blessing(IsoImage *img, unsigned int idx)
{
if (img->hfsplus_blessed[idx] != NULL)
iso_node_unref(img->hfsplus_blessed[idx]);
img->hfsplus_blessed[idx] = NULL;
}
/* API */ /* API */
int iso_image_hfsplus_bless(IsoImage *img, enum IsoHfsplusBlessings blessing, int iso_image_hfsplus_bless(IsoImage *img, enum IsoHfsplusBlessings blessing,
IsoNode *node, int flag) IsoNode *node, int flag)
@ -672,10 +679,10 @@ int iso_image_hfsplus_bless(IsoImage *img, enum IsoHfsplusBlessings blessing,
if (flag & 2) { if (flag & 2) {
/* Delete any blessing */ /* Delete any blessing */
for (i = 0; i < ISO_HFSPLUS_BLESS_MAX; i++) { for (i = 0; i < ISO_HFSPLUS_BLESS_MAX; i++) {
if (img->hfsplus_blessed[i] == node || node == NULL) { if (img->hfsplus_blessed[i] == node || node == NULL) {
img->hfsplus_blessed[i] = NULL; unset_blessing(img, i);
ok = 1; ok = 1;
} }
} }
return ok; return ok;
} }
@ -684,12 +691,17 @@ int iso_image_hfsplus_bless(IsoImage *img, enum IsoHfsplusBlessings blessing,
if (flag & 1) { if (flag & 1) {
/* Delete a particular blessing */ /* Delete a particular blessing */
if (img->hfsplus_blessed[blessing] == node || node == NULL) { if (img->hfsplus_blessed[blessing] == node || node == NULL) {
img->hfsplus_blessed[blessing] = NULL; unset_blessing(img, i);
return 1; return 1;
} }
return 0; return 0;
} }
if (node == NULL) {
unset_blessing(img, (unsigned int) blessing);
return 1;
}
/* No two hats on one node */ /* No two hats on one node */
for (i = 0; i < ISO_HFSPLUS_BLESS_MAX && node != NULL; i++) for (i = 0; i < ISO_HFSPLUS_BLESS_MAX && node != NULL; i++)
if (i != blessing && img->hfsplus_blessed[i] == node) if (i != blessing && img->hfsplus_blessed[i] == node)
@ -703,7 +715,10 @@ int iso_image_hfsplus_bless(IsoImage *img, enum IsoHfsplusBlessings blessing,
return 0; return 0;
} }
unset_blessing(img, (unsigned int) blessing);
img->hfsplus_blessed[blessing] = node; img->hfsplus_blessed[blessing] = node;
if (node != NULL)
iso_node_ref(node);
return 1; return 1;
} }