# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1425220786 -7200
# Node ID c353e6bcb733905ed4bbf7e0825342e86b8dab16
# Parent  f8d75a51de2c1f3335b2ddedb24e5e88d97911fc
Change handling of filename field in PACKs.

diff -r f8d75a51de2c -r c353e6bcb733 src/dmpack.c
--- a/src/dmpack.c	Sun Mar 01 16:27:05 2015 +0200
+++ b/src/dmpack.c	Sun Mar 01 16:39:46 2015 +0200
@@ -134,7 +134,7 @@
             goto out;
         }
 
-        if (!dm_fread_str(pack->file, (Uint8 *) &entry->filename, sizeof(entry->filename)) ||
+        if (!dm_fread_str(pack->file, (Uint8 *) &entry->filename, DMRES_NAME_LEN) ||
             !dm_fread_le32(pack->file, &entry->size) ||
             !dm_fread_le32(pack->file, &entry->offset) ||
             !dm_fread_le32(pack->file, &entry->length) ||
@@ -144,10 +144,14 @@
             goto out;
         }
 
+        // Ensure that the filename ends in NUL
+        entry->filename[DMRES_NAME_LEN] = 0;
+
         // Validate
         if (entry->size == 0 || entry->length == 0 ||
             entry->length > hdr.dirOffset ||
-            entry->offset > hdr.dirOffset)
+            entry->offset > hdr.dirOffset ||
+            strlen(entry->filename) == 0)
         {
             ret = DMERR_INVALID;
             goto out;
diff -r f8d75a51de2c -r c353e6bcb733 src/dmpack.h
--- a/src/dmpack.h	Sun Mar 01 16:27:05 2015 +0200
+++ b/src/dmpack.h	Sun Mar 01 16:39:46 2015 +0200
@@ -15,10 +15,10 @@
 
 typedef struct _DMPackEntry
 {
-    char    filename[DMRES_NAME_LEN];
     Uint32  size;              // Size (UNCOMPRESSED)
     Uint32  offset;            // Offset in pack file
     Uint32  length;            // (Compressed) data length
+    char    filename[DMRES_NAME_LEN + 1]; // +1 for NUL byte
 
     Uint32  flags, privFlags;
     
diff -r f8d75a51de2c -r c353e6bcb733 tools/packed.c
--- a/tools/packed.c	Sun Mar 01 16:27:05 2015 +0200
+++ b/tools/packed.c	Sun Mar 01 16:39:46 2015 +0200
@@ -171,8 +171,8 @@
     if (node == NULL)
         return NULL;
 
-    strncpy(node->filename, src->filename, sizeof(node->filename));
-    node->filename[sizeof(node->filename) - 1] = 0;
+    strncpy(node->filename, src->filename, DMRES_NAME_LEN);
+    node->filename[DMRES_NAME_LEN] = 0;
 
     node->size     = src->size;
     node->offset   = src->offset;
@@ -228,7 +228,7 @@
     while (node != NULL)
     {
         // Write one entry
-        if (!dm_fwrite_str(pack->file, node->filename, sizeof(node->filename)) ||
+        if (!dm_fwrite_str(pack->file, node->filename, DMRES_NAME_LEN) ||
             !dm_fwrite_le32(pack->file, node->size) ||
             !dm_fwrite_le32(pack->file, node->offset) ||
             !dm_fwrite_le32(pack->file, node->length) ||
@@ -362,8 +362,8 @@
     }
 
     // Create directory entry
-    strncpy(entry.filename, filename, sizeof(entry.filename));
-    entry.filename[sizeof(entry.filename) - 1] = 0;
+    strncpy(entry.filename, filename, DMRES_NAME_LEN)
+    entry.filename[DMRES_NAME_LEN] = 0;
     entry.offset = startOffs;
     entry.size   = zstr.total_in;
     entry.length = outSize;