]> granicus.if.org Git - php/commitdiff
Fix bug #68224 buffer-overflow in /ext/fileinfo/libmagic/readcdf.c caught by AddressS...
authorRemi Collet <remi@php.net>
Wed, 22 Oct 2014 13:24:59 +0000 (15:24 +0200)
committerRemi Collet <remi@php.net>
Wed, 22 Oct 2014 13:24:59 +0000 (15:24 +0200)
Upstream commit
https://github.com/file/file/commit/f28fbb947e3aa55fc40b09820f59ebff6f66f213

ext/fileinfo/libmagic/readcdf.c

index ec97ced44b292e4e796761ff99d32c7b31723dcd..175719a2d7a9412601a7ba78035bd126ff5a13d0 100644 (file)
@@ -88,6 +88,9 @@ static const struct cv {
                { 0x00000000000c1084LLU, 0x46000000000000c0LLU },
 #endif
                "x-msi",
+       },
+       {       { 0,                     0                      },
+               NULL,
        }
 }, clsid2desc[] = {
        {
@@ -98,6 +101,9 @@ static const struct cv {
 #endif
                "MSI Installer",
        },
+       {       { 0,                     0                      },
+               NULL,
+       }
 };
 
 private const char *