php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-28 10:12:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
106,915 Commits 547 Branches 1,481 Tags
9716bd68a3e9d207d78da59aecab7785867e94de
Commit Graph

1846 Commits

Author SHA1 Message Date
Christoph M. Becker
eeda55cb3b Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix #76041: null pointer access crashed php
 2018-03-02 17:21:04 +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
Gabriel Caruso
5f54f48024 [ci skip] Remove space between function name and open parentheses 2018-02-24 11:50:39 +01:00
Christoph M. Becker
3da9fc86d1 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix imagesetinterpolation arginfo
 2018-02-24 11:33:13 +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
Gabriel Caruso
e1cc4863d9 Remove duplicated tests 2018-02-22 13:03:21 +01:00
Gabriel Caruso
ded3d984c6 Use EXPECT instead of EXPECTF when possible 
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
 2018-02-20 21:53:48 +01:00
Tom Van Looy
7672f8be0b Fix: follow the indent of the other configure options 2018-02-15 08:49:58 +01:00
Gabriel Caruso
a5f1a585e6 Removed unused variables 2018-02-11 22:46:33 +01:00
Gabriel Caruso
21e3b0c70c Remove trailing whitespace in inc files 2018-02-10 19:20:23 +01:00
Christoph M. Becker
70fec8a1cc Align overflow error messages with upstream 
This particularly fixes two tests (bug66356.phpt and bug72339.phpt) if
PHP has been build with an external libgd.
 2018-02-10 15:41:33 +01:00
Christoph M. Becker
c8ba185cf9 Remove unused function 2018-02-09 17:39:24 +01:00
Christoph M. Becker
41b4a2edc1 Remove unused files 
These files had served as fallback for GD < 2.1.0, but since we're
requiring GD ≥ 2.1.0 for years[1], there's no more need for them.

[1] 8a90aad35b
 2018-02-09 14:45:36 +01:00
Gabriel Caruso
2d48d734a2 Fix some misspellings 2018-02-06 16:59:00 +01:00
Christoph M. Becker
c73e8a07a5 Remove unused variable 
We're not interested in the return value of
`gdGuessBackgroundColorFromCorners`, so there's no need to track it.

See also libgd/libgd@535eab566b.
 2018-02-06 14:59:23 +01:00
Gabriel Caruso
fef879a2d6 Use bool instead of boolean while throwing a type error 
PHP requires boolean typehints to be written "bool" and disallows
"boolean" as an alias. This changes the error messages to match
the actual type name and avoids confusing messages like "must be
of type boolean, boolean given".

This a followup to ce1d69a1f6, which
implements the same change for integer->int.
 2018-02-04 23:09:40 +01:00
Gabriel Caruso
ce1d69a1f6 Use int instead of integer in type errors 
PHP requires integer typehints to be written "int" and does not
allow "integer" as an alias. This changes type error messages to
match the actual type name and avoids confusing messages like
"must be of the type integer, integer given".
 2018-02-04 19:08:23 +01:00
Gabriel Caruso
b0d3c1bf83 Add and fix SKIPIF sections 2018-02-04 17:26:37 +01:00
Gabriel Caruso
84488d921b Remove superfluous SKIPIF sections in more tests 2018-02-04 16:57:08 +01:00
Christoph M. Becker
b309f645f9 Sync gdImageCrop() with upstream 
Besides that we still hope to sync the complete bundled libgd sometime,
the upstream implementation of `gdImageCrop()` is much simpler than the
current one, and thus better readable and less error prone.
 2018-02-02 17:39:23 +01:00
Gabriel Caruso
6400264856 Trailing whitespaces 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
 2018-01-03 14:38:00 +01:00
Xinchen Hui
a7fe2570d3 Merge branch 'master' of git.php.net:/php-src 
* 'master' 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:40 +08: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
05eb5cda50 Merge branch 'PHP-7.2' 
* PHP-7.2:
  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:30 -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
a6519d0514 year++ 2018-01-02 12:57:58 +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
Dmitry Stogov
9e709e2fa0 Move constants into read-only data segment 2017-12-14 18:43:44 +03:00
Christoph M. Becker
fa5c186cc0 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Define floorf if system doesn't have it (follow up for 22c48761)
  Revert "Revert "ext/sodium: pwhash: do not warn on low parameters"" This reverts commit a1845b7fdb.
 2017-11-29 17:06:47 +01: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
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