archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
105643 commits 526 branches 1434 tags 878 MiB
Commit graph

1808 commits

Author SHA1 Message Date
Christoph M. Becker
14469dedde Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt
 2017-10-25 14:58:49 +02: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
1530d01b7a Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix bug #75437 Wrong reflection on imagewebp
 2017-10-25 13:10:33 +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
4d950fa792 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #65148 (imagerotate may alter image dimensions)
 2017-10-24 17:23:24 +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
0eeaff09cb Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix memory leak
 2017-10-23 15:41:06 +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
842dba8f6f Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix PHP_GD_TTSTR: command not found warning in ext/gd
 2017-09-26 00:47:09 +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
Xinchen Hui
ff6f41c94e Narrow typeinfos down for zend_parse_paramenters_none 2017-09-12 11:25:21 +08:00
Xinchen Hui
1f327284a4 Fixed signature 2017-09-09 20:40:55 +08:00
Tom Van Looy
da0b5b35c5 Remove redundant checks in ext/gd 2017-09-04 21:30:09 +02:00
Christoph M. Becker
a7358c756a Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #75139 (libgd/gd_interpolation.c:1786: suspicious if ?)
 2017-09-02 00:21:14 +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 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
a06ba4b9d6 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #75124 (gdImageGrayScale() may produce colors)
 2017-08-27 14:13:55 +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 <a7a7ece>.
 2017-08-27 13:53:39 +02:00
Christoph M. Becker
cae2e49752 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed bug #75111 (Memory disclosure or DoS via crafted .bmp image)
 2017-08-24 14:07:50 +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
Andreas Treichel
e4b9c3744c Replace magic values with constants 2017-08-19 14:28:22 +02:00
Christoph M. Becker
791410ab66 Merge branch 'pull-request/2664' 
* pull-request/2664:
  Fix unittest for minimal length in random string
  Add support for webp in imagecreatefromstring
 2017-08-08 00:07:59 +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
Andreas Treichel
5f9be66502 Fix unittest for minimal length in random string 2017-07-30 04:13:07 +02:00
Andreas Treichel
47fcd13055 Add support for webp in imagecreatefromstring 2017-07-30 02:50:33 +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
Christoph M. Becker
68a0639c8f Fix #74744: gd.h: stdarg.h include missing for va_list use in gdErrorMethod 2017-06-11 17:17:01 +02:00
Sean Fraser
7a7e0f7da0
added test for imagecopymergegray(), added color check to test for imagecopymerge() 2017-06-01 08:17:36 +01:00
Xinchen Hui
696bd37e67 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed condition check
  Fixed condition check
  another place

Conflicts:
	ext/mcrypt/mcrypt.c
 2017-04-10 14:49:13 +08:00