diff options
| author | Remi Collet <remi@php.net> | 2014-10-22 15:24:59 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-10-22 15:24:59 +0200 |
| commit | ef2a2fa3a1a67244532dca90438971c5f9919806 (patch) | |
| tree | 1377dcdbfaf8823bdd2f619bba832a3c0873612e | |
| parent | e0b247bc87f0532979e7193b263eb454ce739a28 (diff) | |
| download | php-git-ef2a2fa3a1a67244532dca90438971c5f9919806.tar.gz | |
Fix bug #68224 buffer-overflow in /ext/fileinfo/libmagic/readcdf.c caught by AddressSanitizer
Upstream commit
https://github.com/file/file/commit/f28fbb947e3aa55fc40b09820f59ebff6f66f213
| -rw-r--r-- | ext/fileinfo/libmagic/readcdf.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/fileinfo/libmagic/readcdf.c b/ext/fileinfo/libmagic/readcdf.c index ec97ced44b..175719a2d7 100644 --- a/ext/fileinfo/libmagic/readcdf.c +++ b/ext/fileinfo/libmagic/readcdf.c @@ -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 * |