From: Sara Golemon <pollita@php.net>
Date: Sat, 7 Oct 2006 16:40:39 +0000 (+0000)
Subject: MFH(r-1.356) Don't assume the array elements are arrays too
X-Git-Tag: php-5.2.0RC6~74
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34ed116e90809d9d164021bdd2f73bb38b84e571;p=php

MFH(r-1.356) Don't assume the array elements are arrays too
---

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index f42b06fec9..8fe9c6ca5f 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -5092,7 +5092,7 @@ PHP_FUNCTION(imageconvolution)
 	}
 
 	for (i=0; i<3; i++) {
-		if (zend_hash_index_find(Z_ARRVAL_P(hash_matrix), (i), (void **) &var) == SUCCESS) {
+		if (zend_hash_index_find(Z_ARRVAL_P(hash_matrix), (i), (void **) &var) == SUCCESS && Z_TYPE_PP(var) == IS_ARRAY) {
 			if (Z_TYPE_PP(var) != IS_ARRAY || zend_hash_num_elements(Z_ARRVAL_PP(var)) != 3 ) {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must have 3x3 array");
 				RETURN_FALSE;