com php-src: Fix bug #72730 - imagegammacorrect allows arbitrary write access: ext/gd/gd.c ext/gd/tests/bug72730.phpt
| From: | Anatol Belski | Date: | Wed, 17 Aug 2016 11:45:14 +0000 |
| Subject: | com php-src: Fix bug #72730 - imagegammacorrect allows arbitrary write access: ext/gd/gd.c ext/gd/tests/bug72730.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93899@lists.php.net to get a copy of this message | ||
Commit: bab470f6ba67f5b2e83d8152ae9adee5161a975e
Author: Stanislav Malyshev <stas@php.net> Wed, 10 Aug 2016 00:14:58 -0700
Committer: Anatol Belski <ab@php.net> Wed, 17 Aug 2016 13:45:14 +0200
Parents: b2d89c93e85504ccfcd865213685b89ec1cafcf9
Branches: PHP-7.0.10
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bab470f6ba67f5b2e83d8152ae9adee5161a975e
Log:
Fix bug #72730 - imagegammacorrect allows arbitrary write access
(cherry picked from commit 047fe0ed03093a496691d376fcf51a7e2f1d04b0)
Conflicts:
ext/gd/gd.c
(cherry picked from commit e70069a62fb7252252cad9506fac5baf4ac11d21)
Bugs:
https://bugs.php.net/72730
Changed paths:
M ext/gd/gd.c
A ext/gd/tests/bug72730.phpt
Diff:
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 9375aee..3faea95 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -3032,6 +3032,11 @@ PHP_FUNCTION(imagegammacorrect)
return;
}
+ if ( input <= 0.0 || output <= 0.0 ) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Gamma values should be positive");
+ RETURN_FALSE;
+ }
+
if ((im = (gdImagePtr)zend_fetch_resource(Z_RES_P(IM), "Image", le_gd)) == NULL) {
RETURN_FALSE;
}
diff --git a/ext/gd/tests/bug72730.phpt b/ext/gd/tests/bug72730.phpt
new file mode 100644
index 0000000..e7c13cb
--- /dev/null
+++ b/ext/gd/tests/bug72730.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #72730: imagegammacorrect allows arbitrary write access
+--SKIPIF--
+<?php
+if (!function_exists("imagecreatetruecolor")) die("skip");
+?>
+--FILE--
+<?php
+$img = imagecreatetruecolor(1, 1);
+imagegammacorrect($img, -1, 1337);
+?>
+DONE
+--EXPECTF--
+Warning: imagegammacorrect(): Gamma values should be positive in %sbug72730.php on line %d
+DONE
\ No newline at end of file