From: Brad Daily <brad@bradleyboy.com>
Date: Wed, 19 Feb 2014 21:24:15 +0000 (-0600)
Subject: Fixes #66714: imageconvolution breakage in 5.5.9
X-Git-Tag: php-5.5.11RC1~69
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=143bb29c1ac3f959f44b8fe59adef4d1840bc393;p=php

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.
---

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index ab4ab2df56..0c4a0b36ff 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);