Skip to content

Commit b4f501d

Browse files
committed
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: Fix #78849: GD build broken with -D SIGNED_COMPARE_SLOW
2 parents 3b46fbf + 9b92c1d commit b4f501d

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ PHP NEWS
66
. Fixed bug #78787 (Segfault with trait overriding inherited private shadow
77
property). (Nikita)
88

9+
- GD:
10+
. Fixed bug #78849 (GD build broken with -D SIGNED_COMPARE_SLOW). (cmb)
11+
912
- OPcache:
1013
. Fixed potential ASLR related invalid opline handler issues. (cmb)
1114
. Fixed $x = (bool)$x; with opcache (should emit undeclared variable notice).

ext/gd/libgd/gd_gif_out.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ compress(int init_bits, gdIOCtxPtr outfile, gdImagePtr im, GifCtx *ctx)
534534
output( (code_int)ctx->ClearCode, ctx );
535535

536536
#ifdef SIGNED_COMPARE_SLOW
537-
while ( (c = GIFNextPixel( im )) != (unsigned) EOF ) {
537+
while ( (c = GIFNextPixel( im, ctx )) != (unsigned) EOF ) {
538538
#else /*SIGNED_COMPARE_SLOW*/
539539
while ( (c = GIFNextPixel( im, ctx )) != EOF ) { /* } */
540540
#endif /*SIGNED_COMPARE_SLOW*/

0 commit comments

Comments
 (0)