diff options
| author | Christoph M. Becker <cmb@php.net> | 2015-07-23 18:13:47 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2015-07-23 18:31:28 +0200 |
| commit | 87829c09a1d9e39bee994460d7ccf19dd20eda14 (patch) | |
| tree | 223ae10d7283266ac65b47a11cc7f7fe72bb160f /ext/standard/tests/image | |
| parent | 91f985b2f9b5ba03d7b98bdaa710331c115f6a70 (diff) | |
| download | php-git-87829c09a1d9e39bee994460d7ccf19dd20eda14.tar.gz | |
Fix #70052: getimagesize() fails for very large and very small WBMP
Very large WBMP (width or height greater than 2**31-1) cause an overflow and
circumvent the size limitation of 2048x2048 px. Very small WBMP (less than 12
bytes) cause a read error and are not recognized. This patch fixes both bugs.
Diffstat (limited to 'ext/standard/tests/image')
| -rw-r--r-- | ext/standard/tests/image/bug70052.phpt | 21 | ||||
| -rw-r--r-- | ext/standard/tests/image/bug70052_1.wbmp | bin | 0 -> 12 bytes | |||
| -rw-r--r-- | ext/standard/tests/image/bug70052_2.wbmp | bin | 0 -> 7 bytes |
3 files changed, 21 insertions, 0 deletions
diff --git a/ext/standard/tests/image/bug70052.phpt b/ext/standard/tests/image/bug70052.phpt new file mode 100644 index 0000000000..76ebda92b2 --- /dev/null +++ b/ext/standard/tests/image/bug70052.phpt @@ -0,0 +1,21 @@ +--TEST-- +Bug #70052 (getimagesize() fails for very large and very small WBMP) +--FILE-- +<?php +var_dump(getimagesize(__DIR__ . '/bug70052_1.wbmp')); +var_dump(getimagesize(__DIR__ . '/bug70052_2.wbmp')); +?> +--EXPECT-- +bool(false) +array(5) { + [0]=> + int(3) + [1]=> + int(3) + [2]=> + int(15) + [3]=> + string(20) "width="3" height="3"" + ["mime"]=> + string(18) "image/vnd.wap.wbmp" +} diff --git a/ext/standard/tests/image/bug70052_1.wbmp b/ext/standard/tests/image/bug70052_1.wbmp Binary files differnew file mode 100644 index 0000000000..2c32f379ae --- /dev/null +++ b/ext/standard/tests/image/bug70052_1.wbmp diff --git a/ext/standard/tests/image/bug70052_2.wbmp b/ext/standard/tests/image/bug70052_2.wbmp Binary files differnew file mode 100644 index 0000000000..d0f4313fc1 --- /dev/null +++ b/ext/standard/tests/image/bug70052_2.wbmp |