Don't forget to squash this commit

Author: ragusaa

libclamav/iso9660.c

@@ -100,37 +100,22 @@ static cl_error_t iso_scan_file(const iso9660_t *iso, unsigned int block, unsign
 
 static char *iso_string(iso9660_t *iso, const void *src, unsigned int len)
 {
-
-    memset(iso->buf, 0, sizeof(iso->buf));
-
     if (iso->joliet) {
-        char *utf8        = NULL;
-        const char *uutf8 = NULL;
-
-        if (cli_isutf8(src, len)) {
-            uutf8 = src;
-        } else {
-
-            if (len > (sizeof(iso->buf) - 2)) {
-                len = sizeof(iso->buf) - 2;
-            }
-            utf8 = cli_utf16_to_utf8(src, len, E_UTF16_BE);
-            if (utf8 && cli_isutf8(utf8, len)) {
-                uutf8 = utf8;
-            } else {
-                uutf8 = "";
-            }
-        }
-
+        char *utf8;
+        const char *uutf8;
+        if (len > (sizeof(iso->buf) - 2))
+            len = sizeof(iso->buf) - 2;
+        memcpy(iso->buf, src, len);
+        iso->buf[len]     = '\0';
+        iso->buf[len + 1] = '\0';
+        utf8              = cli_utf16_to_utf8(iso->buf, len, E_UTF16_BE);
+        uutf8             = utf8 ? utf8 : "";
         strncpy(iso->buf, uutf8, sizeof(iso->buf));
-        iso->buf[sizeof(iso->buf) - 1] = 0;
-        FREE(utf8);
+        iso->buf[sizeof(iso->buf) - 1] = '\0';
+        free(utf8);
     } else {
-        if (len > (sizeof(iso->buf) - 1)) {
-            len = sizeof(iso->buf) - 1;
-        }
         memcpy(iso->buf, src, len);
-        iso->buf[len] = 0;
+        iso->buf[len] = '\0';
     }
     return iso->buf;
 }
@@ -243,8 +228,9 @@ cl_error_t cli_scaniso(cli_ctx *ctx, size_t offset)
     const uint8_t *privol, *next;
     iso9660_t iso;
     int i;
-    cl_error_t status = CL_SUCCESS;
-    cl_error_t ret    = CL_SUCCESS;
+    cl_error_t status   = CL_SUCCESS;
+    cl_error_t ret      = CL_SUCCESS;
+    uint32_t nextJoliet = 0;
 
     if (offset < 32768) {
         /* Need 16 sectors at least 2048 bytes long */
@@ -312,6 +298,9 @@ cl_error_t cli_scaniso(cli_ctx *ctx, size_t offset)
         next = NULL;
     }
 
+    nextJoliet = iso.joliet;
+    iso.joliet = 0;
+
     do {
         cli_dbgmsg("in cli_scaniso\n");
         if (cli_debug_flag) {
@@ -382,8 +371,9 @@ cl_error_t cli_scaniso(cli_ctx *ctx, size_t offset)
             status = ret;
         }
 
-        privol = next;
-        next   = NULL;
+        privol     = next;
+        next       = NULL;
+        iso.joliet = nextJoliet;
 
     } while (privol);