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

Avoided use of uninitialized variables which was introduced by commit d9c548d

Browse Source
This commit is contained in:
Thomas Schmitt 2024-05-18 13:42:37 +02:00
parent 8ffd3b381b
commit 483a68aaf2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libisofs/fs_image.c
View File

@ -4496,7 +4496,6 @@ int iso_analyze_gpt(IsoImage *image, IsoDataSource *src, int flag)
{ {
int ret, i, j; int ret, i, j;
uint64_t start_block, block_count, flags, end_block, j_end, j_start; uint64_t start_block, block_count, flags, end_block, j_end, j_start;
uint32_t next_above;
uint8_t *part; uint8_t *part;
struct iso_imported_sys_area *sai; struct iso_imported_sys_area *sai;
struct iso_gpt_partition_request *gpt_entry; struct iso_gpt_partition_request *gpt_entry;
@ -4591,7 +4590,7 @@ int iso_analyze_gpt(IsoImage *image, IsoDataSource *src, int flag)
continue; continue;
ret = iso_tree_get_node_of_block(image, NULL, ret = iso_tree_get_node_of_block(image, NULL,
(uint32_t) (gpt_entry->start_block / 4), (uint32_t) (gpt_entry->start_block / 4),
&node, &next_above, 0); &node, NULL, 0);
if (ret > 0) if (ret > 0)
gpt_entry->image_path = iso_tree_get_node_path(node); gpt_entry->image_path = iso_tree_get_node_path(node);
} }
@ -4627,7 +4626,7 @@ static
int iso_analyze_apm(IsoImage *image, IsoDataSource *src, int flag) int iso_analyze_apm(IsoImage *image, IsoDataSource *src, int flag)
{ {
int ret, i; int ret, i;
uint32_t map_entries, start_block, block_count, flags, next_above; uint32_t map_entries, start_block, block_count, flags;
char *sad, *part, name[33], type_string[33]; char *sad, *part, name[33], type_string[33];
struct iso_imported_sys_area *sai; struct iso_imported_sys_area *sai;
struct iso_apm_partition_request *apm_entry; struct iso_apm_partition_request *apm_entry;
@ -4688,7 +4687,7 @@ int iso_analyze_apm(IsoImage *image, IsoDataSource *src, int flag)
ret = iso_tree_get_node_of_block(image, NULL, ret = iso_tree_get_node_of_block(image, NULL,
(uint32_t) (apm_entry->start_block / (uint32_t) (apm_entry->start_block /
(2048 / sai->apm_block_size)), (2048 / sai->apm_block_size)),
&node, &next_above, 0); &node, NULL, 0);
if (ret > 0) if (ret > 0)
apm_entry->image_path = iso_tree_get_node_path(node); apm_entry->image_path = iso_tree_get_node_path(node);
} }

2
libisofs/tree.c
View File

@ -1294,6 +1294,8 @@ ex:;
} }
/* Note: No reference is taken to the found node. /* Note: No reference is taken to the found node.
Warning: Do not submit next_above uninitialized.
Submit NULL if next_above is not of interest.
@param flag bit0= recursion @param flag bit0= recursion
*/ */
int iso_tree_get_node_of_block(IsoImage *image, IsoDir *dir, uint32_t block, int iso_tree_get_node_of_block(IsoImage *image, IsoDir *dir, uint32_t block,