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

Fixed SIGSEGV introduced with previous revision

Browse Source
This commit is contained in:
Thomas Schmitt 2008-10-25 17:00:47 +00:00
parent 7c1ddfd2a7
commit 1ba33532e1
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.10.25.123133" #define Xorriso_timestamP "2008.10.25.170010"

12
libisoburn/trunk/xorriso/xorrisoburn.c
View File

@ -3892,8 +3892,14 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag)
if(ret == 1) { if(ret == 1) {
sprintf(respt, "Boot record : El Torito"); sprintf(respt, "Boot record : El Torito");
ret= Xorriso_is_isohybrid(xorriso, bootimg_node, 0); 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, " , ISOLINUX boot image capable of isohybrid");
}
strcat(respt, "\n"); strcat(respt, "\n");
Xorriso_toc_line(xorriso, flag & 8); Xorriso_toc_line(xorriso, flag & 8);
ret= Xorriso_path_from_node(xorriso, (IsoNode *) bootimg_node, path, 0); 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) { if(ret > 0) {
ret= 1; ret= 1;
Findjob_get_found_path(job, &found_path, 0); 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; ret= -1;
} }
Findjob_destroy(&job, 0); Findjob_destroy(&job, 0);