File php-CVE-2018-5711.patch of Package php7

Overview Repositories Revisions Requests Users Attributes Meta

File php-CVE-2018-5711.patch of Package php7 (Revision 8a49bf0158869c65188b47f177252cdd)

Currently displaying revision 8a49bf0158869c65188b47f177252cdd , Show latest

X-Git-Url: http://208.43.231.11:8000/?p=php-src.git;a=blobdiff_plain;f=ext%2Fgd%2Flibgd%2Fgd_gif_in.c;h=16776d362e638e8971bebd310a31f8c4abeab32f;hp=e0f0fe398a61485cc17d0982a5763236fbd63b1c;hb=8d6e9588671136837533fe3785657c31c5b52767;hpb=73ca9b37731dd9690ffd9706333b17eaf90ea091

diff --git a/ext/gd/libgd/gd_gif_in.c b/ext/gd/libgd/gd_gif_in.c
index e0f0fe3..16776d3 100644
--- a/ext/gd/libgd/gd_gif_in.c
+++ b/ext/gd/libgd/gd_gif_in.c
@@ -261,10 +261,6 @@ terminated:
 	if (!im) {
 		return 0;
 	}
-	if (!im->colorsTotal) {
-		gdImageDestroy(im);
-		return 0;
-	}
 	/* Check for open colors at the end, so
 	   we can reduce colorsTotal and ultimately
 	   BitsPerPixel */
@@ -275,6 +271,10 @@ terminated:
 			break;
 		}
 	}
+	if (!im->colorsTotal) {
+		gdImageDestroy(im);
+		return 0;
+	}
 	return im;
 }
 /* }}} */
@@ -375,7 +375,7 @@ static int
 GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroDataBlockP)
 {
 	int           i, j, ret;
-	unsigned char count;
+	int           count;
 
 	if (flag) {
 		scd->curbit = 0;

Places

File php-CVE-2018-5711.patch of Package php7 (Revision 8a49bf0158869c65188b47f177252cdd)

Places