From: Pierre Joye <pierre.php@gmail.com>
Date: Sun, 9 Mar 2014 20:12:19 +0000 (+0100)
Subject: - fix #66869, Invalid 2nd argument crashes imageaffinematrixget
X-Git-Tag: php-5.5.11RC1~22^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e3c2015dc71271523f502bed7afdbb2aeb0acae;p=php

- fix #66869, Invalid 2nd argument crashes imageaffinematrixget
---

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 0c4a0b36ff..1058eaee5c 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -5298,6 +5298,7 @@ PHP_FUNCTION(imageaffinematrixget)
 			double x, y;
 			if (Z_TYPE_P(options) != IS_ARRAY) {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array expected as options");
+				RETURN_FALSE;
 			}
 			if (zend_hash_find(HASH_OF(options), "x", sizeof("x"), (void **)&tmp) != FAILURE) {
 				if (Z_TYPE_PP(tmp) != IS_DOUBLE) {