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

Bug fix: Long Joliet names with leading dot were mangled one char too short

Browse Source
This commit is contained in:
Thomas Schmitt 2018-03-31 18:20:55 +02:00
parent ad843f1723
commit 310612174b
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libisofs/joliet.c
View File

@ -401,6 +401,20 @@ int joliet_create_mangled_name(uint16_t *dest, uint16_t *src, int digits,
return ISO_SUCCESS; return ISO_SUCCESS;
} }
/*
* From Joliet specs:
* "ISO 9660 (Section 7.5.1) states that the sum of the following shall not
* exceed 30:
* - If there is a file name, the length of the file name.
* - If there is a file name extension, the length of the file name extension.
* On Joliet compliant media, however, the sum as calculated above shall not
* exceed 128 [bytes], to allow for longer file identifiers."
*
* I.e. the dot does not count.
*
* (We have an option to lift the limit from 64*2 to 103*2, which is the
* maximum to fit into an ISO 9660 directory record.)
*/
static static
int mangle_single_dir(Ecma119Image *t, JolietNode *dir) int mangle_single_dir(Ecma119Image *t, JolietNode *dir)
{ {
@ -481,25 +495,26 @@ int mangle_single_dir(Ecma119Image *t, JolietNode *dir)
ext = dot + 1; ext = dot + 1;
extlen = ucslen(ext); extlen = ucslen(ext);
max = maxchar + 1 - extlen - 1 - digits; max = maxchar - extlen - digits;
if (max <= 0) { if (max <= 0) {
/* this can happen if extension is too long */
if (extlen + max > 3) {
/* /*
* reduce extension len, to give name an extra char * This can happen if the extension is too long.
* note that max is negative or 0 * Reduce its length, to give name at least one
* original character, if it has any.
*/ */
extlen = extlen + max - 1; max = (dot > full_name);
ext[extlen] = 0; extlen = maxchar - max - digits;
max = maxchar + 2 - extlen - 1 - digits; if (extlen < 3) {
} else {
/* /*
* error, we don't support extensions < 3 * error, we do not reduce extensions to length < 3
* This can't happen with current limit of digits. *
* This cannot happen with current limit of digits
* because maxchar is at least 64 and digits at most 7.
*/ */
ret = ISO_ERROR; ret = ISO_ERROR;
goto mangle_cleanup; goto mangle_cleanup;
} }
ext[extlen] = 0;
} }
/* ok, reduce name by digits */ /* ok, reduce name by digits */
if (name + max < dot) { if (name + max < dot) {