From 2be47f9af838911fb55c60fff27e3831db7182ba Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 12 Sep 2016 17:58:13 +0200 Subject: [PATCH] Bug fix: SIGSEGV by NULL when a data file was larger than ISO level allows. --- ChangeLog | 2 ++ libisofs/ecma119_tree.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index bf05a4d..f9888c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,10 @@ bzr branch lp:libisofs/for-libisoburn (to become libisofs-1.4.6.tar.gz) =============================================================================== +* Bug fix: SIGSEGV by NULL when a data file was larger than ISO level allows. * New API calls iso_generate_gpt_guid() and +iso_write_opts_set_gpt_guid(). + libisofs-1.4.4.tar.gz Fri Jul 01 2016 =============================================================================== * Bug fix: HFS+ production could cause MBR partition of type 0xEE without GPT. diff --git a/libisofs/ecma119_tree.c b/libisofs/ecma119_tree.c index 5b6965d..39f12b8 100644 --- a/libisofs/ecma119_tree.c +++ b/libisofs/ecma119_tree.c @@ -241,11 +241,11 @@ int create_file_src(Ecma119Image *img, IsoFile *iso, IsoFileSrc **src) size = iso_stream_get_size(iso->stream); if (size > (off_t)MAX_ISO_FILE_SECTION_SIZE && img->opts->iso_level != 3) { char *ipath = iso_tree_get_node_path(ISO_NODE(iso)); - ret = iso_msg_submit(img->image->id, ISO_FILE_TOO_BIG, 0, - "File \"%s\" can't be added to image because " - "is greater than 4GB", ipath); + iso_msg_submit(img->image->id, ISO_FILE_TOO_BIG, 0, + "File \"%s\" cannot be added to image because " + "its size is 4 GiB or larger", ipath); free(ipath); - return ret; + return ISO_FILE_TOO_BIG; } ret = iso_file_src_create(img, iso, src); if (ret < 0) {