com php-src: Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx(): ext/gd/libgd/gd_gd2.c ext/gd/tests/bug73868 .gd2 ext/gd/tests/bug73868.phpt
| From: | Anatol Belski | Date: | Tue, 17 Jan 2017 08:43:01 +0000 |
| Subject: | com php-src: Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx(): ext/gd/libgd/gd_gd2.c ext/gd/tests/bug73868 .gd2 ext/gd/tests/bug73868.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96764@lists.php.net to get a copy of this message | ||
Commit: e720bc03b19c22846c562a62b42235b544c1794c
Author: Christoph M. Becker <cmbecker69@gmx.de> Tue, 16 Aug 2016 18:23:36 +0200
Committer: Anatol Belski <ab@php.net> Tue, 17 Jan 2017 09:43:01 +0100
Parents: 761cc2b766e040452f026a3b4c3b2c71bcbfb3dd
Branches: PHP-7.0.15
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e720bc03b19c22846c562a62b42235b544c1794c
Log:
Fix #73868: DOS vulnerability in gdImageCreateFromGd2Ctx()
We must not pretend that there are image data if there are none. Instead
we fail reading the image file gracefully.
(cherry picked from commit cdb648dc4115ce0722f3cc75e6a65115fc0e56ab)
(cherry picked from commit f1b2afc9d9e77edf41804f5dfc4e2069d8a12975)
Bugs:
https://bugs.php.net/73868
Changed paths:
M ext/gd/libgd/gd_gd2.c
A ext/gd/tests/bug73868.gd2
A ext/gd/tests/bug73868.phpt
Diff:
diff --git a/ext/gd/libgd/gd_gd2.c b/ext/gd/libgd/gd_gd2.c
index 83eaaa3..3eba6b3 100644
--- a/ext/gd/libgd/gd_gd2.c
+++ b/ext/gd/libgd/gd_gd2.c
@@ -344,12 +344,16 @@ gdImagePtr gdImageCreateFromGd2Ctx (gdIOCtxPtr in)
for (x = xlo; x < xhi; x++) {
if (im->trueColor) {
if (!gdGetInt(&im->tpixels[y][x], in)) {
- im->tpixels[y][x] = 0;
+ php_gd_error("gd2: EOF while reading\n");
+ gdImageDestroy(im);
+ return NULL;
}
} else {
int ch;
if (!gdGetByte(&ch, in)) {
- ch = 0;
+ php_gd_error("gd2: EOF while reading\n");
+ gdImageDestroy(im);
+ return NULL;
}
im->pixels[y][x] = ch;
}
diff --git a/ext/gd/tests/bug73868.gd2 b/ext/gd/tests/bug73868.gd2
new file mode 100644
index 0000000..1c797d1
Binary files /dev/null and b/ext/gd/tests/bug73868.gd2 differ
diff --git a/ext/gd/tests/bug73868.phpt b/ext/gd/tests/bug73868.phpt
new file mode 100644
index 0000000..135be79
--- /dev/null
+++ b/ext/gd/tests/bug73868.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Bug 73868 (DOS vulnerability in gdImageCreateFromGd2Ctx())
+--SKIPIF--
+<?php
+if (!extension_loaded('gd')) die('skip gd extension not available');
+?>
+--FILE--
+<?php
+var_dump(imagecreatefromgd2(__DIR__ . DIRECTORY_SEPARATOR . 'bug73868.gd2'));
+?>
+===DONE===
+--EXPECTF--
+Warning: imagecreatefromgd2(): gd2: EOF while reading
+ in %s on line %d
+
+Warning: imagecreatefromgd2(): '%s' is not a valid GD2 file in %s on line %d
+bool(false)
+===DONE===