From: Pierre Joye Date: Sat, 24 Sep 2005 14:37:49 +0000 (+0000) Subject: - #33220, fix infinite loop while loading invalid gif, this patch fixes X-Git-Tag: RELEASE_0_9_0~122 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97bad74c0fdf043253c7b3eabca11a0ecc4cebcf;p=php - #33220, fix infinite loop while loading invalid gif, this patch fixes at least many cases (nlopess) --- diff --git a/ext/gd/libgd/gd_gif_in.c b/ext/gd/libgd/gd_gif_in.c index 73f5e49c2d..1733a646f3 100644 --- a/ext/gd/libgd/gd_gif_in.c +++ b/ext/gd/libgd/gd_gif_in.c @@ -259,13 +259,13 @@ DoExtension(gdIOCtx *fd, int label, int *Transparent) if ((buf[0] & 0x1) != 0) *Transparent = buf[3]; - while (GetDataBlock(fd, (unsigned char*) buf) != 0) + while (GetDataBlock(fd, (unsigned char*) buf) > 0) ; return FALSE; default: break; } - while (GetDataBlock(fd, (unsigned char*) buf) != 0) + while (GetDataBlock(fd, (unsigned char*) buf) > 0) ; return FALSE; @@ -337,7 +337,7 @@ GetCode_(gdIOCtx *fd, int code_size, int flag) buf[0] = buf[last_byte-2]; buf[1] = buf[last_byte-1]; - if ((count = GetDataBlock(fd, &buf[2])) == 0) + if ((count = GetDataBlock(fd, &buf[2])) <= 0) done = TRUE; last_byte = 2 + count;