|
From: | Pete Batard |
Subject: | Re: [Libcdio-devel] Hindsight is 2020 - Let's sort multiextents at last |
Date: | Sat, 23 May 2020 15:13:58 +0100 |
User-agent: | Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 |
On 2020.05.23 14:41, Thomas Schmitt wrote:
diff --git a/lib/iso9660/iso9660_fs.c b/lib/iso9660/iso9660_fs.c index ed2d158..48e098f 100644 --- a/lib/iso9660/iso9660_fs.c +++ b/lib/iso9660/iso9660_fs.c @@ -844,7 +844,9 @@ _iso9660_dir_to_statbuf (iso9660_dir_t *p_iso9660_dir, { /* Check if this is the last part of a multiextent file */ if (!first_extent) { - if (strcmp(p_stat->filename, &p_iso9660_dir->filename.str[1]) != 0) { + if (strlen(p_stat->filename) != i_fname || + strncmp(p_stat->filename, &p_iso9660_dir->filename.str[1], i_fname) + != 0) { cdio_warn("Non consecutive multiextent file parts for '%s'", p_stat->filename); goto fail; =========================================================================
Good call!I never saw that one with the ISOs I tested, but then again, I haven't tested an ISO with non-consecutive extents.
I have applied your patch, and also applied a second one that fixes the use of staging macros I failed to revert (At one stage, I was using LIBCDIO_API_2020 instead of DO_NOT_WANT_COMPATIBILITY, and I overlooked changing some of these back).
If you pull the branch, you should have these 2 patches now. Regards, /Pete
[Prev in Thread] | Current Thread | [Next in Thread] |