Re: cvs: php-src(PHP_4_4) /ext/gd/libgd gd_gif_in.c

Hello Pierre-Alain, as soon as 5.1 is released we can mark 5.0 as dead and no longer support it. If someone feels so they can do on their own i'd say. But we cannot get rid of 4.4. (Just my thought on this) marcus Sunday, September 25, 2005, 2:13:50 PM, you wrote: > pajoye Sun Sep 25 08:13:50 2005 EDT > Modified files: (Branch: PHP_4_4) > /php-src/ext/gd/libgd gd_gif_in.c > Log: > - MFH #33220, infinite loop while loading invalid GIF (nlopees) > NB: It's getting really annoying to apply patches to all these branches > Can we no define 4.x and 5.0.x as dead for 99.99% of the fixes? > > > > http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gd_gif_in.c?r1=1.2.2.2&r2=1.2.2.2.6.1&ty=u > Index: php-src/ext/gd/libgd/gd_gif_in.c > diff -u php-src/ext/gd/libgd/gd_gif_in.c:1.2.2.2 > php-src/ext/gd/libgd/gd_gif_in.c:1.2.2.2.6.1 > --- php-src/ext/gd/libgd/gd_gif_in.c:1.2.2.2 Tue Jun 3 19:42:49 2003 > +++ php-src/ext/gd/libgd/gd_gif_in.c Sun Sep 25 08:13:49 2005 > @@ -259,13 +259,13 @@ > 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 @@ > 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; Best regards, Marcus