From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Mon, 19 Sep 2016 14:49:06 +0000 (+0200)
Subject: Port gdImageSetStyle() overflow check from libgd 2.0.29
X-Git-Tag: php-7.2.0alpha1~1238
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77ba2483d95ec12a8ec4c12ccd0453827f8d3fb8;p=php

Port gdImageSetStyle() overflow check from libgd 2.0.29
---

diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c
index 57c0aeafb1..7a0af8de92 100644
--- a/ext/gd/libgd/gd.c
+++ b/ext/gd/libgd/gd.c
@@ -2789,6 +2789,9 @@ void gdImageSetStyle (gdImagePtr im, int *style, int noOfPixels)
 	if (im->style) {
 		gdFree(im->style);
 	}
+	if (overflow2(sizeof (int), noOfPixels)) {
+		return;
+	}
 	im->style = (int *) gdMalloc(sizeof(int) * noOfPixels);
 	memcpy(im->style, style, sizeof(int) * noOfPixels);
 	im->styleLength = noOfPixels;