diff options
| author | Remi Collet <remi@php.net> | 2014-12-17 11:00:52 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-12-17 11:00:52 +0100 |
| commit | f382fbf4c1e1cea3cf6137f69f03810c7e99ee32 (patch) | |
| tree | d36ecb0100653721b8f8da9fc0d15ffda128292c | |
| parent | ffae8f154988cc5d0fb04693fd3f7ae796d2f4f8 (diff) | |
| parent | 5fc2fede9c7c963c950d8b96dcc0f7af88b4d695 (diff) | |
| download | php-git-f382fbf4c1e1cea3cf6137f69f03810c7e99ee32.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/81e9a993f2893d651d225646378e3fd1b7465467
| -rw-r--r-- | ext/gd/libgd/gd_gif_in.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/gd/libgd/gd_gif_in.c b/ext/gd/libgd/gd_gif_in.c index 491e9422db..f41ec8460a 100644 --- 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; |