From 2bcf60e42233bdfda7546ac6334a25fce3d94d72 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sat, 25 Oct 2008 17:00:47 +0000 Subject: [PATCH] Fixed SIGSEGV introduced with previous revision --- xorriso/xorriso_timestamp.h | 2 +- xorriso/xorrisoburn.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 07c615d6..67e60f0c 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.10.25.123133" +#define Xorriso_timestamP "2008.10.25.170010" diff --git a/xorriso/xorrisoburn.c b/xorriso/xorrisoburn.c index 90426bc2..06c37f2d 100644 --- a/xorriso/xorrisoburn.c +++ b/xorriso/xorrisoburn.c @@ -3892,8 +3892,14 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag) if(ret == 1) { sprintf(respt, "Boot record : El Torito"); ret= Xorriso_is_isohybrid(xorriso, bootimg_node, 0); - if(ret > 0) + if(ret > 0) { + + /* >>> Conditions for MBR recognition : first 512 bytes of LBA 0*/ + /* >>> byte 432 to 435 holds the lba of bootimg_node */ + /* >>> byte 510 is 0x55 , byte 511 is 0xaa */ + strcat(respt, " , ISOLINUX boot image capable of isohybrid"); + } strcat(respt, "\n"); Xorriso_toc_line(xorriso, flag & 8); ret= Xorriso_path_from_node(xorriso, (IsoNode *) bootimg_node, path, 0); @@ -6461,7 +6467,9 @@ int Xorriso_path_from_node(struct XorrisO *xorriso, IsoNode *node, if(ret > 0) { ret= 1; Findjob_get_found_path(job, &found_path, 0); - if(Sfile_str(path, found_path, 0) <= 0) + if(found_path == NULL) + ret= 0; + else if(Sfile_str(path, found_path, 0) <= 0) ret= -1; } Findjob_destroy(&job, 0);