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

Avoiding to print a NULL pointer via %s in a HFS+ debug message

Browse Source
This commit is contained in:
Thomas Schmitt 2012-06-17 12:56:32 +02:00
parent 6fd859a2c1
commit 9882d983b9
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libisofs/hfsplus.c
View File

@ -674,8 +674,17 @@ int hfsplus_writer_write_data(IsoImageWriter *writer)
for (j = 0; j < t->hfsp_levels[level].nodes[i].cnt; j++) for (j = 0; j < t->hfsp_levels[level].nodes[i].cnt; j++)
{ {
iso_msb ((uint8_t *) buffer + HFSPLUS_CAT_NODE_SIZE - j * 2 - 2, curoff, 2); iso_msb ((uint8_t *) buffer + HFSPLUS_CAT_NODE_SIZE - j * 2 - 2, curoff, 2);
iso_msg_debug(t->image->id, "%d out of %d, %s", (int) curnode, t->hfsp_nleafs, if (t->hfsp_leafs[curnode].node->name == NULL)
{
iso_msg_debug(t->image->id, "%d out of %d",
(int) curnode, t->hfsp_nleafs);
}
else
{
iso_msg_debug(t->image->id, "%d out of %d, %s",
(int) curnode, t->hfsp_nleafs,
t->hfsp_leafs[curnode].node->name); t->hfsp_leafs[curnode].node->name);
}
switch (t->hfsp_leafs[curnode].type) switch (t->hfsp_leafs[curnode].type)
{ {