php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-18 21:41:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
105,646 Commits 547 Branches 1,483 Tags
fed09a23b7af9024ebb4e7c8fb592752425bdc7a
Commit Graph

1811 Commits

Author SHA1 Message Date
Christoph M. Becker
76f421dd3a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #52070: imagedashedline() - dashed line sometimes is not visible
 2018-03-30 19:29:10 +02:00
Christoph M. Becker
9c37d95627 Fix #52070: imagedashedline() - dashed line sometimes is not visible 
We finally remove the inadvertent leftover from the synchronization
with GD 2.0.12.
 2018-03-30 19:22:23 +02:00
Christoph M. Becker
d709922979 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #73957: signed integer conversion in imagescale()
 2018-03-10 00:25:11 +01:00
Christoph M. Becker
f1b358c9a9 Fix #73957: signed integer conversion in imagescale() 
We must not pass values to `gdImageScale()` which cannot be represented
by an `unsigned int`.  Instead we return FALSE, according to what we
already did for negative integers.
 2018-03-10 00:17:09 +01:00
Christoph M. Becker
d83467d70b Fix #76041: null pointer access crashed php 
We must not draw anti-aliased lines on palette images, because that is
not supported by `gdImageSetAAPixelColor()` and it wouldn't make much
sense to support it, due to the limitation to at most 256 colors.
 2018-03-02 17:18:45 +01:00
Christoph M. Becker
8c396e0e88 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix imagesetinterpolation arginfo
 2018-02-24 11:32:03 +01:00
Gabriel Caruso
a358211a75 Fix imagesetinterpolation arginfo 
imagesetinterpolation only requires one parameter.
 2018-02-24 11:30:24 +01:00
Xinchen Hui
e8eb52dc98 Merge branch 'PHP-7.2' of git.php.net:/php-src into PHP-7.2 
* 'PHP-7.2' of git.php.net:/php-src:
  Update NEWS
  Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
  Fix bug #74782: remove file name from output to avoid XSS
 2018-01-02 13:50:18 +08:00
Xinchen Hui
bd23bcec3e Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1 
* 'PHP-7.1' of git.php.net:/php-src:
  Update NEWS
  Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
  Fix bug #74782: remove file name from output to avoid XSS
 2018-01-02 13:49:58 +08:00
Stanislav Malyshev
a68dc899bb Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
  Fix bug #74782: remove file name from output to avoid XSS
 2018-01-01 21:07:21 -08:00
Xinchen Hui
7a7ec01a49 year++ 2018-01-02 12:55:14 +08:00
Xinchen Hui
ccd4716ec7 year++ 2018-01-02 12:53:31 +08:00
Stanislav Malyshev
92c19f8a26 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Update NEWS
  Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
  Fix bug #74782: remove file name from output to avoid XSS
 2018-01-01 20:52:34 -08:00
Stanislav Malyshev
459ab2eef4 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Update NEWS
  Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
  Fix bug #74782: remove file name from output to avoid XSS
 2018-01-01 20:28:01 -08:00
Christoph M. Becker
8d6e958867 Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx 
Due to a signedness confusion in `GetCode_` a corrupt GIF file can
trigger an infinite loop.  Furthermore we make sure that a GIF without
any palette entries is treated as invalid *after* open palette entries
have been removed.
 2018-01-01 19:51:26 -08:00
Christoph M. Becker
995ac8a094 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Define floorf if system doesn't have it (follow up for 22c48761)
 2017-11-29 16:59:17 +01:00
Christoph M. Becker
f166ea9c09 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Define floorf if system doesn't have it (follow up for 22c48761)
 2017-11-29 16:53:11 +01:00
Lior Kaplan
32e3d7b99e Define floorf if system doesn't have it (follow up for 22c48761) 
floorf is checked in config.m4
 2017-11-29 16:46:47 +01:00
Christoph M. Becker
a059244b3c Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt
 2017-10-25 14:53:01 +02:00
Christoph M. Becker
b6b0289f5e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt
 2017-10-25 14:47:11 +02:00
Fabien Villepinte
e763a1cdc7 Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt 2017-10-25 14:39:38 +02:00
Christoph M. Becker
c78813a6b8 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #75437 Wrong reflection on imagewebp
 2017-10-25 13:03:42 +02:00
Christoph M. Becker
9d59beb8ba Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75437 Wrong reflection on imagewebp
 2017-10-25 12:56:25 +02:00
Fabien Villepinte
0fbb9f343f Fix bug #75437 Wrong reflection on imagewebp 2017-10-25 12:54:05 +02:00
Christoph M. Becker
c04617aa61 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #65148 (imagerotate may alter image dimensions)
 2017-10-24 17:17:18 +02:00
Christoph M. Becker
9c79de4d62 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #65148 (imagerotate may alter image dimensions)
 2017-10-24 17:09:59 +02:00
Christoph M. Becker
22c487616f Fixed bug #65148 (imagerotate may alter image dimensions) 
We apply the respective patches from external libgd, work around the
still missing `gdImageClone()`, and fix the special cased rotation
routines according to Pierre's patch
(https://gist.github.com/pierrejoye/59d72385ed1888cf8894a7ed437235ae).

We also cater to bug73272.phpt whose result obviously changes a bit.
 2017-10-24 17:02:56 +02:00
Anatol Belski
9beb743b07 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix memory leak
 2017-10-23 15:40:37 +02:00
Anatol Belski
5b497797f2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix memory leak
 2017-10-23 15:40:05 +02:00
Anatol Belski
1cb2079d6c Fix memory leak 2017-10-23 15:26:08 +02:00
Christoph M. Becker
296eb5193c Merge branch 'pull-request/2773' into PHP-7.2 
* pull-request/2773:
  Fix PHP_GD_TTSTR: command not found warning in ext/gd
 2017-09-26 00:45:21 +02:00
Peter Kokot
8c85d7b732 Fix PHP_GD_TTSTR: command not found warning in ext/gd 2017-09-25 02:37:42 +02:00
Christoph M. Becker
b4dc3de5ab Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75139 (libgd/gd_interpolation.c:1786: suspicious if ?)
 2017-09-02 00:20:46 +02:00
Christoph M. Becker
afad9006c7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75139 (libgd/gd_interpolation.c:1786: suspicious if ?)
 2017-09-02 00:11:36 +02:00
Christoph M. Becker
e20a6b0213 Fixed bug #75139 (libgd/gd_interpolation.c:1786: suspicious if ?) 
We back-port https://github.com/libgd/libgd/commit/dd48286 even though
we cannot come up with a regression test, because the erroneous
condition appears to be impossible to trigger.

We also parenthesize the inner ternary operation to avoid confusion.
 2017-09-02 00:04:02 +02:00
Christoph M. Becker
1aeafb7d4a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #75124 (gdImageGrayScale() may produce colors)
 2017-08-27 14:07:55 +02:00
Christoph M. Becker
a9ff4d1f5a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75124 (gdImageGrayScale() may produce colors)
 2017-08-27 13:55:23 +02:00
Christoph M. Becker
499f5480f1 Fixed bug #75124 (gdImageGrayScale() may produce colors) 
We have to make sure to avoid alpha-blending issues by explicitly
switching to `gdEffectReplace` and to restore the old value afterwards.

This is a port of <https://github.com/libgd/libgd/commit/a7a7ece>.
 2017-08-27 13:53:39 +02:00
Christoph M. Becker
5cd348c1d6 Fixed bug #75111 (Memory disclosure or DoS via crafted .bmp image) 
Crafted BMP images can cause dynamicSeek() to be called with a negative
position which must not be allowed, since dynamicSeek() works like
fseek() in SEEK_SET mode. We solve this by bailing out if `pos` is
negative, and let the image reading fail gracefully.
 2017-08-24 14:07:10 +02:00
Christoph M. Becker
d53b78c6ed Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Shrink test image
 2017-07-30 15:01:59 +02:00
Christoph M. Becker
82e4ad3983 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Shrink test image
 2017-07-30 14:44:52 +02:00
Christoph M. Becker
74a696d53b Shrink test image 
The last (`IDAT`) chunk in this file starting at `0x5e265` reports to
have a length of `0x2000` bytes, but there are only `0x1D9B` bytes
left. Simply cutting the first `IDAT` chunk which starts at `0x31` and
also reports a length of `0x2000` at the same offset should produce the
same test results (while reducing the file size to 7.628 bytes).
 2017-07-30 14:43:37 +02:00
Christoph M. Becker
782f45c8e6 It's --SKIPIF--, not --SKIP-- 2017-07-30 14:01:51 +02:00
Christoph M. Becker
71e47c5c13 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Skip this test if ext/gd is not available
 2017-07-30 13:37:36 +02:00
Christoph M. Becker
f213ee5952 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Skip this test if ext/gd is not available
 2017-07-30 13:30:18 +02:00
Christoph M. Becker
4d6f808c16 Skip this test if ext/gd is not available 2017-07-30 13:24:10 +02:00
Stanislav Malyshev
d75dbb0e31 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Improve fix for #74145
  Fix wddx
  Fix tests
  Fixed bug #74111
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #74087
  Fixed parsing of strange formats with mixed month/day and time strings
  Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV
  Fixed bug #74111
  Fix #74435: Buffer over-read into uninitialized memory
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #73807
 2017-07-04 21:23:16 -07:00
Stanislav Malyshev
0ba04f7737 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Improve fix for #74145
  Fix wddx
  Fix tests
  Fixed bug #74111
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #74087
  Fixed parsing of strange formats with mixed month/day and time strings
  Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV
  Fixed bug #74111
  Fix #74435: Buffer over-read into uninitialized memory
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #73807
 2017-07-04 21:18:10 -07:00
Stanislav Malyshev
0496f5407f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Update NEWS
  Fix bug #74087
  Fixed parsing of strange formats with mixed month/day and time strings
  Fix bug #74145 - wddx parsing empty boolean tag leads to SIGSEGV
  Fixed bug #74111
  Fix #74435: Buffer over-read into uninitialized memory
  Fix bug #74603 - use correct buffer size
  Fix bug #74651 - check EVP_SealInit as it can return -1
  Update NEWS
  Fix bug #73807
 2017-07-04 19:44:51 -07:00
Christoph M. Becker
8dc4f4dc9e Fix #74435: Buffer over-read into uninitialized memory 
The stack allocated color map buffers were not zeroed before usage, and
so undefined palette indexes could cause information leakage.
 2017-07-04 19:00:57 -07:00