com php-src: - fix #66869, Invalid 2nd argument crashes imageaffinematrixget: ext/gd/gd.c
| From: | Pierre Joye | Date: | Sun, 09 Mar 2014 20:12:19 +0000 |
| Subject: | com php-src: - fix #66869, Invalid 2nd argument crashes imageaffinematrixget: ext/gd/gd.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76396@lists.php.net to get a copy of this message | ||
Commit: 8e3c2015dc71271523f502bed7afdbb2aeb0acae
Author: Pierre Joye <pierre.php@gmail.com> Sun, 9 Mar 2014 21:12:19 +0100
Parents: 0c74d5ef089302193b0b15172059af74dd4934b4
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8e3c2015dc71271523f502bed7afdbb2aeb0acae
Log:
- fix #66869, Invalid 2nd argument crashes imageaffinematrixget
Bugs:
https://bugs.php.net/66869
Changed paths:
M ext/gd/gd.c
Diff:
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 0c4a0b3..1058eae 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) {