Merge branch 'PHP-5.6'

remicollet · remicollet · commit f61071205fee · 2014-12-17T11:01:23.000+01:00
* PHP-5.6: Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
diff --git a/ext/gd/libgd/gd_gif_in.c b/ext/gd/libgd/gd_gif_in.c
@@ -400,14 +400,14 @@ GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroD
 		scd->lastbit = (2+count)*8 ;
 	}
 
-	ret = 0;
-	for (i = scd->curbit, j = 0; j < code_size; ++i, ++j)
-		if (i < CSD_BUF_SIZE * 8) {
+	if ((scd->curbit + code_size - 1) >= (CSD_BUF_SIZE * 8)) {
+		ret = -1;
+	} else {
+		ret = 0;
+		for (i = scd->curbit, j = 0; j < code_size; ++i, ++j) {
 			ret |= ((scd->buf[i / 8] & (1 << (i % 8))) != 0) << j;
-		} else {
-			ret = -1;
-			break;
 		}
+	}
 
 	scd->curbit += code_size;
 	return ret;
