diff options
| author | Anatol Belski <ab@php.net> | 2016-03-28 00:45:19 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2016-03-30 23:00:33 +0200 |
| commit | 7522335b994595f8ef28b078b4ce440eca225422 (patch) | |
| tree | 09f69cbd00b1dc12f8ad89103b345a4459b0a08b | |
| parent | 43416cfc065b9d1d7d35db7ad42534759d01e77a (diff) | |
| download | php-git-7522335b994595f8ef28b078b4ce440eca225422.tar.gz | |
Fixed bug #71527 Buffer over-write in finfo_open with malformed magic file
The actual fix is applying the upstream patch from
https://github.com/file/file/commit/6713ca45e7757297381f4b4cdb9cf5e624a9ad36
| -rw-r--r-- | ext/fileinfo/libmagic/funcs.c | 2 | ||||
| -rw-r--r-- | ext/fileinfo/tests/bug68996.phpt | 9 | ||||
| -rw-r--r-- | ext/fileinfo/tests/bug71527.magic | 1 | ||||
| -rw-r--r-- | ext/fileinfo/tests/bug71527.phpt | 19 |
4 files changed, 24 insertions, 7 deletions
diff --git a/ext/fileinfo/libmagic/funcs.c b/ext/fileinfo/libmagic/funcs.c index bd6d3d592e..e3249c19e2 100644 --- a/ext/fileinfo/libmagic/funcs.c +++ b/ext/fileinfo/libmagic/funcs.c @@ -414,7 +414,7 @@ file_check_mem(struct magic_set *ms, unsigned int level) size_t len; if (level >= ms->c.len) { - len = (ms->c.len += 20) * sizeof(*ms->c.li); + len = (ms->c.len += 20 + level) * sizeof(*ms->c.li); ms->c.li = CAST(struct level_info *, (ms->c.li == NULL) ? emalloc(len) : erealloc(ms->c.li, len)); diff --git a/ext/fileinfo/tests/bug68996.phpt b/ext/fileinfo/tests/bug68996.phpt index 9fa2190307..da208d35bc 100644 --- a/ext/fileinfo/tests/bug68996.phpt +++ b/ext/fileinfo/tests/bug68996.phpt @@ -1,14 +1,11 @@ --TEST-- Bug #68996 (Invalid free of CG(interned_empty_string)) --SKIPIF-- -<?php -if (getenv("USE_ZEND_ALLOC") !== "0") { - print "skip Need Zend MM disabled"; -} -?> <?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> --INI-- html_errors=1 +--ENV-- +USE_ZEND_ALLOC=0 --FILE-- <?php finfo_open(FILEINFO_MIME_TYPE, "\xfc\x63"); @@ -19,4 +16,4 @@ finfo_open(FILEINFO_MIME_TYPE, "\xfc\x63"); <br /> <b>Warning</b>: : failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>%d</b><br /> <br /> -<b>Warning</b>: finfo_open(): in <b>%sbug68996.php</b> on line <b>%d</b><br /> +<b>Warning</b>: finfo_open(): Failed to load magic database at '%s�c'. in <b>%sbug68996.php</b> on line <b>%d</b><br /> diff --git a/ext/fileinfo/tests/bug71527.magic b/ext/fileinfo/tests/bug71527.magic new file mode 100644 index 0000000000..14d77817be --- /dev/null +++ b/ext/fileinfo/tests/bug71527.magic @@ -0,0 +1 @@ +>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
\ No newline at end of file diff --git a/ext/fileinfo/tests/bug71527.phpt b/ext/fileinfo/tests/bug71527.phpt new file mode 100644 index 0000000000..f5b1d860e8 --- /dev/null +++ b/ext/fileinfo/tests/bug71527.phpt @@ -0,0 +1,19 @@ +--TEST-- +Bug #71527 Buffer over-write in finfo_open with malformed magic file +--SKIPIF-- +<?php +if (!class_exists('finfo')) + die('skip no fileinfo extension'); +--ENV-- +USE_ZEND_ALLOC=0 +--FILE-- +<?php + $finfo = finfo_open(FILEINFO_NONE, dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug71527.magic"); + $info = finfo_file($finfo, __FILE__); + var_dump($info); +?> +--EXPECTF-- +Warning: finfo_open(): Failed to load magic database at '%sbug71527.magic'. in %sbug71527.php on line %d + +Warning: finfo_file() expects parameter 1 to be resource, boolean given in %sbug71527.php on line %d +bool(false) |