diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-11-21 10:00:31 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-11-21 10:01:05 +0100 |
| commit | b4f501d5a421a0861a9464b9352b40927bbabd78 (patch) | |
| tree | 377d2ade8f8d6f322e5ad38d87046bf19ca4e237 | |
| parent | 3b46fbfc367c20e47d9c2c8e71d70ea7d27e0d2b (diff) | |
| parent | 9b92c1d15415de0cdb14c8cf7b7575238ce380ca (diff) | |
| download | php-git-b4f501d5a421a0861a9464b9352b40927bbabd78.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78849: GD build broken with -D SIGNED_COMPARE_SLOW
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/gd/libgd/gd_gif_out.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -6,6 +6,9 @@ PHP NEWS . Fixed bug #78787 (Segfault with trait overriding inherited private shadow property). (Nikita) +- GD: + . Fixed bug #78849 (GD build broken with -D SIGNED_COMPARE_SLOW). (cmb) + - OPcache: . Fixed potential ASLR related invalid opline handler issues. (cmb) . Fixed $x = (bool)$x; with opcache (should emit undeclared variable notice). diff --git a/ext/gd/libgd/gd_gif_out.c b/ext/gd/libgd/gd_gif_out.c index cd4ea1529b..c0a0433f4d 100644 --- a/ext/gd/libgd/gd_gif_out.c +++ b/ext/gd/libgd/gd_gif_out.c @@ -534,7 +534,7 @@ compress(int init_bits, gdIOCtxPtr outfile, gdImagePtr im, GifCtx *ctx) output( (code_int)ctx->ClearCode, ctx ); #ifdef SIGNED_COMPARE_SLOW - while ( (c = GIFNextPixel( im )) != (unsigned) EOF ) { + while ( (c = GIFNextPixel( im, ctx )) != (unsigned) EOF ) { #else /*SIGNED_COMPARE_SLOW*/ while ( (c = GIFNextPixel( im, ctx )) != EOF ) { /* } */ #endif /*SIGNED_COMPARE_SLOW*/ |