summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSara Golemon <pollita@php.net>2006-10-07 16:40:39 +0000
committerSara Golemon <pollita@php.net>2006-10-07 16:40:39 +0000
commit34ed116e90809d9d164021bdd2f73bb38b84e571 (patch)
tree97e83232d8a12b9284b6c37e7f898dc7e9e7405b
parente43519e9142d2953e1dbe2634117837ceb1cbcd0 (diff)
downloadphp-git-34ed116e90809d9d164021bdd2f73bb38b84e571.tar.gz
MFH(r-1.356) Don't assume the array elements are arrays too
-rw-r--r--ext/gd/gd.c2
1 files changed, 1 insertions, 1 deletions
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;