fix #215 gdImageFillToBorder stack-overflow when invalid color is used

libgd · Jun 4, 2016 · 77f619d · 77f619d
1 parent 73f4e03
commit 77f619d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/src/gd.c b/src/gd.c
@@ -1928,11 +1928,17 @@ BGD_DECLARE(void) gdImageFillToBorder (gdImagePtr im, int x, int y, int border,
 	int i;
 	int restoreAlphaBleding;
 
-	if (border < 0) {
+	if (border < 0 || color < 0) {
 		/* Refuse to fill to a non-solid border */
 		return;
 	}
 
+	if (!im->trueColor) {
+		if ((color > (im->colorsTotal - 1)) || (border > (im->colorsTotal - 1))) {
+			return;
+		}
+    }
+
 	leftLimit = (-1);
 
 	restoreAlphaBleding = im->alphaBlendingFlag;

diff --git a/tests/gdimagefilltoborder/.gitignore b/tests/gdimagefilltoborder/.gitignore
@@ -1 +1,2 @@
 /bug00037
+/github_bug_215
diff --git a/tests/gdimagefilltoborder/CMakeLists.txt b/tests/gdimagefilltoborder/CMakeLists.txt
@@ -1,5 +1,6 @@
 SET(TESTS_FILES
 	bug00037
+	github_bug_215
 )
 
 ADD_GD_TESTS()
diff --git a/tests/gdimagefilltoborder/Makemodule.am b/tests/gdimagefilltoborder/Makemodule.am
@@ -1,6 +1,7 @@
 if HAVE_LIBPNG
 libgd_test_programs += \
-	gdimagefilltoborder/bug00037
+	gdimagefilltoborder/bug00037 \
+	gdimagefilltoborder/github_bug_215
 endif
 
 EXTRA_DIST += \