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

Bug fix: Boot catalog could get a wrong name if cat_path= is explicitely given but not containing a slash character

Browse Source
This commit is contained in:
Thomas Schmitt
2020-11-07 12:42:16 +01:00
parent 05de7ec5ee
commit 6fa5f97da8
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xorriso/write_run.c
View File

@ -692,10 +692,12 @@ int Xorriso_attach_boot_image(struct XorrisO *xorriso, int flag)
if(xorriso->boot_image_cat_path[0] == 0) {
strcpy(xorriso->boot_image_cat_path, bin_path);
cpt= strrchr(xorriso->boot_image_cat_path, '/');
if(cpt == NULL)
cpt= xorriso->boot_image_cat_path;
else
if(cpt == NULL) {
strcpy(xorriso->boot_image_cat_path, "/");
cpt= xorriso->boot_image_cat_path + 1;
} else {
cpt++;
}
strcpy(cpt, "boot.cat");
}
ret= Xorriso_node_from_path(xorriso, image, xorriso->boot_image_cat_path,
@ -1261,7 +1263,7 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
if(ret > 0) {
if(strcmp(sfe, xorriso->boot_image_cat_path) != 0) {
ret= Xorriso_rename(xorriso, NULL, sfe,
xorriso->boot_image_cat_path, 0);
xorriso->boot_image_cat_path, 1);
if(ret <= 0)
goto ex;
}