com php-src: Fixes #66714: imageconvolution breakage in 5.5.9: ext/gd/gd.c

From: Date: Wed, 19 Feb 2014 21:24:15 +0000
Subject: com php-src: Fixes #66714: imageconvolution breakage in 5.5.9: ext/gd/gd.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-76132@lists.php.net to get a copy of this message
Commit: 143bb29c1ac3f959f44b8fe59adef4d1840bc393 Author: Brad Daily <brad@bradleyboy.com> Wed, 19 Feb 2014 15:24:15 -0600 Parents: a7d36066507b8d43c4a63bb60ba3ec1de3b68aaf Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=143bb29c1ac3f959f44b8fe59adef4d1840bc393 Log: Fixes #66714: imageconvolution breakage in 5.5.9 5.5.9 included some GD fixes related to #66356. One of those fixes changed the above section of imageconvolution, but the variable was mistyped. Bugs: https://bugs.php.net/66714 https://bugs.php.net/66356 Changed paths: M ext/gd/gd.c Diff: diff --git a/ext/gd/gd.c b/ext/gd/gd.c index ab4ab2d..0c4a0b3 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -4879,7 +4879,7 @@ PHP_FUNCTION(imageconvolution) if (zend_hash_index_find(Z_ARRVAL_PP(var), (j), (void **) &var2) == SUCCESS) { if (Z_TYPE_PP(var2) != IS_DOUBLE) { zval dval; - dval = **var; + dval = **var2; zval_copy_ctor(&dval); convert_to_double(&dval); matrix[i][j] = (float)Z_DVAL(dval);

« previous php.cvs (#76132) next »