diff options
| author | Christoph M. Becker <cmb@php.net> | 2015-07-19 22:01:20 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2015-07-19 22:01:20 +0200 |
| commit | 209223b97e179e27f1520a870e954e7de13c03bb (patch) | |
| tree | 876d6d25f62dcf0557ccaa8b8c5171a0628c3c7c | |
| parent | 3de0ae5477825445f35b448c2e6245b9196dd528 (diff) | |
| parent | d3958b32caf606a2710436f8c80df58152e3b160 (diff) | |
| download | php-git-209223b97e179e27f1520a870e954e7de13c03bb.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fixed Fix #66590, which may segfault
| -rw-r--r-- | ext/gd/libgd/webpimg.c | 1 | ||||
| -rw-r--r-- | ext/gd/tests/bug66590_1.phpt | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/ext/gd/libgd/webpimg.c b/ext/gd/libgd/webpimg.c index 760dd54690..5f19bd78d6 100644 --- a/ext/gd/libgd/webpimg.c +++ b/ext/gd/libgd/webpimg.c @@ -789,6 +789,7 @@ WebPResult WebPEncode(const uint8* Y, return webp_failure; } p[new_size - 1] = 0; + *p_out = p; *p_out_size_bytes = new_size; } diff --git a/ext/gd/tests/bug66590_1.phpt b/ext/gd/tests/bug66590_1.phpt new file mode 100644 index 0000000000..9e598d1eae --- /dev/null +++ b/ext/gd/tests/bug66590_1.phpt @@ -0,0 +1,17 @@ +--TEST-- +Bug #66590 (imagewebp() doesn't pad to even length) - segfault +--SKIPIF-- +<?php +if (!extension_loaded('gd')) die('skip gd extension not available'); +if (!function_exists('imagewebp')) die('skip WebP support not available'); +?> +--FILE-- +<?php +$im = imagecreatetruecolor(6, 6); +ob_start(); +imagewebp($im); +ob_end_clean(); +echo "ready\n"; +?> +--EXPECT-- +ready |