diff options
author | Stanislav Malyshev <stas@php.net> | 2019-05-27 16:49:25 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2019-05-27 16:49:25 -0700 |
commit | c7eb0feed8651b0c3f851e7701fd8fe471c4c717 (patch) | |
tree | 28010095560bb69284395d57b645e861724af658 /ext/iconv/tests | |
parent | 0cb43ec51c0cbb7971bedd6be8ca80aba01c74a8 (diff) | |
parent | e77c8e45bab082f32d0a6351b0b4fb8a0c0f3ba2 (diff) | |
download | php-git-c7eb0feed8651b0c3f851e7701fd8fe471c4c717.tar.gz |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS
Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
Fix #77973: Uninitialized read in gdImageCreateFromXbm
Diffstat (limited to 'ext/iconv/tests')
-rw-r--r-- | ext/iconv/tests/bug78069.data | bin | 0 -> 107 bytes | |||
-rw-r--r-- | ext/iconv/tests/bug78069.phpt | 15 |
2 files changed, 15 insertions, 0 deletions
diff --git a/ext/iconv/tests/bug78069.data b/ext/iconv/tests/bug78069.data Binary files differnew file mode 100644 index 0000000000..ebd5d0bdcf --- /dev/null +++ b/ext/iconv/tests/bug78069.data diff --git a/ext/iconv/tests/bug78069.phpt b/ext/iconv/tests/bug78069.phpt new file mode 100644 index 0000000000..1341a5ef4f --- /dev/null +++ b/ext/iconv/tests/bug78069.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #78069 (Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow) +--SKIPIF-- +<?php +if (!extension_loaded('iconv')) die('skip ext/iconv required'); +?> +--FILE-- +<?php +$hdr = iconv_mime_decode_headers(file_get_contents(__DIR__ . "/bug78069.data"),2); +var_dump(count($hdr)); +?> +DONE +--EXPECT-- +int(1) +DONE
\ No newline at end of file |