Remove special treatment of NUL bytes in file names.

This brings libzip in line with unzip and 7zip and reflects usual string handling.

When checking consistency, reject file names containing NUL bytes.

This adresses PR #507 and issue #505.

Author: dillof

THANKS

@@ -173,6 +173,7 @@ Transporter <[email protected]>
 Vassili Courzakis <[email protected]>
 Vinpasso
 Vitaly Murashev <[email protected]>
+Vladislav Kachegov
 William Lee
 William Ouwehand <[email protected]>
 Wojciech Michalski <[email protected]>

lib/zip_dirent.c

@@ -505,6 +505,20 @@ _zip_dirent_read(zip_dirent_t *zde, zip_source_t *src, zip_buffer_t *buffer, boo
                 return -1;
             }
         }
+
+        if (check_consistency) {
+            zip_uint8_t *p;
+
+            for (p = zde->filename->raw; p < zde->filename->raw + zde->filename->length; p++) {
+                if (*p == 0) {
+                    zip_error_set(error, ZIP_ER_INCONS, ZIP_ER_DETAIL_NUL_IN_FILENAME);
+                    if (!from_buffer) {
+                        _zip_buffer_free(buffer);
+                    }
+                    return -1;
+                }
+            }
+        }
     }
 
     if (ef_len) {

lib/zip_io_util.c

@@ -93,12 +93,7 @@ _zip_read_data(zip_buffer_t *buffer, zip_source_t *src, size_t length, bool nulp
     }
 
     if (nulp) {
-        zip_uint8_t *o;
-        /* replace any in-string NUL characters with spaces */
         r[length] = 0;
-        for (o = r; o < r + length; o++)
-            if (*o == '\0')
-                *o = ' ';
     }
 
     return r;

lib/zipint.h

@@ -243,6 +243,7 @@ extern const int _zip_err_details_count;
 #define ZIP_ER_DETAIL_UTF8_FILENAME_MISMATCH 23 /* E UTF-8 filename is ASCII and doesn't match filename */
 #define ZIP_ER_DETAIL_UTF8_COMMENT_MISMATCH 24 /* E UTF-8 comment is ASCII and doesn't match comment */
 #define ZIP_ER_DETAIL_COMPRESSED_DATA_TRAILING_GARBAGE 25 /* G garbage at end of compressed data */
+#define ZIP_ER_DETAIL_NUL_IN_FILENAME 26 /* E NUL byte in file name */
 
 /* directory entry: general purpose bit flags */
 

regress/open_incons.test

@@ -95,7 +95,7 @@ opening 'incons-local-compsize-smaller.zzip' returned error Zip archive inconsis
 opening 'incons-local-crc.zzip' returned error Zip archive inconsistent: entry 0: local and central headers do not match
 opening 'incons-local-filename-long.zzip' returned error Premature end of file
 opening 'incons-local-filename-missing.zzip' returned error Zip archive inconsistent: entry 0: local and central headers do not match
-opening 'incons-filename-nul-byte.zzip' succeeded, 1 entries
+opening 'incons-filename-nul-byte.zzip' returned error Zip archive inconsistent: entry 0: NUL byte in file name
 opening 'incons-local-filename-short.zzip' returned error Zip archive inconsistent: entry 0: extra field length is invalid
 opening 'incons-local-filename.zzip' returned error Zip archive inconsistent: entry 0: local and central headers do not match
 opening 'incons-local-magic-bad.zzip' returned error Not a zip archive
@@ -105,5 +105,5 @@ opening 'incons-streamed.zzip' returned error Zip archive inconsistent: entry 0:
 opening 'incons-streamed-2.zzip' returned error Zip archive inconsistent: entry 0: local header and data descriptor do not match
 end-of-inline-data
 stderr
-40 errors
+41 errors
 end-of-inline-data