]> granicus.if.org Git - php/commitdiff
Fixes #66714: imageconvolution breakage in 5.5.9
authorBrad Daily <brad@bradleyboy.com>
Wed, 19 Feb 2014 21:24:15 +0000 (15:24 -0600)
committerBrad Daily <brad@bradleyboy.com>
Wed, 19 Feb 2014 21:24:15 +0000 (15:24 -0600)
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.

ext/gd/gd.c

index ab4ab2df56b7bb2b81a5ad59f645d5304bc27985..0c4a0b36ff2702112de434a87395ce2b6cc376a8 100644 (file)
@@ -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);