1
0
mirror of https://github.com/php/php-src.git synced 2026-04-22 07:28:09 +02:00
Commit Graph

43130 Commits

Author SHA1 Message Date
Stanislav Malyshev 8e2c9024a6 Fix for #73240 - Write out of bounds at number_format
(cherry picked from commit 8259130b6b)
(cherry picked from commit 01280f8deb)
2016-10-14 01:41:48 +02:00
Anatol Belski 0cf880e70c avoid strlen
(cherry picked from commit aaa5d07365)
2016-10-14 01:41:32 +02:00
Stanislav Malyshev d25e427ab1 Bug #73218: add mitigation for ICU int overflow
(cherry picked from commit d946d10293)
(cherry picked from commit b26b02b2df)
2016-10-14 01:41:06 +02:00
Stanislav Malyshev 0d9d133cd6 Add more locale length checks, due to ICU bugs.
(cherry picked from commit d3eb58332a)
(cherry picked from commit 87a8240b5a)
2016-10-14 01:40:36 +02:00
Stanislav Malyshev 336322ce63 Fix bug #73150: missing NULL check in dom_document_save_html
(cherry picked from commit 1c0e9126fb)
(cherry picked from commit d1e878f272)
2016-10-14 01:40:12 +02:00
Stanislav Malyshev 6b2992f54c Fix for #73240 - Write out of bounds at number_format
(cherry picked from commit 3b5262ec4c)
2016-10-14 01:37:13 +02:00
Stanislav Malyshev f901dce575 Fix bug #73257 and bug #73258 - SplObjectStorage unserialize allows use of non-object as key
(cherry picked from commit 61cdd1255d)
2016-10-14 01:36:57 +02:00
Stanislav Malyshev c4254588a9 Fix bug #73091 - Unserializing DateInterval object may lead to __toString invocation
(cherry picked from commit 1b29e4488e)
2016-10-14 01:36:38 +02:00
Sara Golemon 25d4943b44 Clear FG(user_stream_current_filename) when bailing out
If a userwrapper opener E_ERRORs then FG(user_stream_current_filename)
would remain set until the next request and would not be pointing
at unallocated memory.

Catch the bailout, clear the variable, then continue bailing.

Closes https://bugs.php.net/bug.php?id=73188

(cherry picked from commit 9f86cdaf7f)
2016-10-14 01:34:51 +02:00
Dmitry Stogov e92a18dcd5 Fixed referencecounter inference rules
(cherry picked from commit 6046a99b97)
2016-10-14 01:24:46 +02:00
Dmitry Stogov 233992409b Fixed referencecounter inference rules
(cherry picked from commit fae7d6b9bb)
2016-10-14 01:24:23 +02:00
Anatol Belski 5a2dd84314 add test for bug #73037
(cherry picked from commit 256b150a96)
2016-10-14 01:21:18 +02:00
Nikita Popov 28edc971e7 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-10 12:21:15 +02:00
Nikita Popov c91f652ddb Fixed bug #73273
As well as a few other $_SESSION separation issues.
2016-10-10 12:20:44 +02:00
Christoph M. Becker 0f40ca989a Merge branch 'PHP-7.0' into PHP-7.1 2016-10-10 12:12:13 +02:00
Christoph M. Becker fb08216b08 Merge branch 'PHP-5.6' into PHP-7.0 2016-10-10 11:45:53 +02:00
Christoph M. Becker fc989fc6e7 Fix #73279: Integer overflow in gdImageScaleBilinearPalette()
The color components are supposed to be in range 0..255, so we must not
cast them to `signed char`, what can be the default for `char`.

Port of <https://github.com/libgd/libgd/commit/77c8d359>.
2016-10-10 11:41:39 +02:00
Dmitry Stogov 3760bc5407 Removed deprecated flag 2016-10-10 11:48:29 +03:00
Dmitry Stogov 771600ee6b Fixed information about possible return value 2016-10-10 11:46:43 +03:00
Christoph M. Becker a16f0c5e01 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-09 15:21:40 +02:00
Christoph M. Becker c930714cbe Merge branch 'PHP-5.6' into PHP-7.0 2016-10-09 15:14:17 +02:00
Christoph M. Becker b92216b97d Fix #73272: imagescale() affects imagesetinterpolation()
We must not permanently change the interpolation method, but rather
have to restore the old method after we're done with scaling the image.
2016-10-09 15:10:34 +02:00
Christoph M. Becker ed282f110b Remove channels from getimagesize() results for WebP
Both lossless and lossy WebP can have an alpha channel, but this is
somewhat hard to detect. Furthermore, it is not clear whether an alpha
channel should be counted for getimagesize(). Therefore we remove the
`channel` element from the result array.
2016-10-08 19:47:32 +02:00
Anatol Belski c43a54e4fe Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix leak
2016-10-08 19:28:21 +02:00
Anatol Belski 6f84ac721b Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix leak
2016-10-08 19:25:36 +02:00
Anatol Belski 3c5742ebd7 fix leak 2016-10-08 19:07:35 +02:00
Christoph M. Becker 1d977e55d9 Add VP8X support to getimagesize() and friends
This ammends commit 14d4ee93 to also add support for the extended
WebP format, according to
<https://developers.google.com/speed/webp/docs/riff_container>.
2016-10-08 15:06:07 +02:00
Christoph M. Becker 5540aba258 Fix WS
As discussed in
<https://github.com/php/php-src/commit/14d4ee93#commitcomment-19344508>.
2016-10-08 11:22:12 +02:00
Christoph M. Becker 59cd8eb723 Add VP8L support to getimagesize() and friends
This ammends commit 14d4ee93 to also add support for simple lossless
WebP, according to
<https://chromium.googlesource.com/webm/libwebp/+/master/doc/webp-lossless-bitstream-spec.txt>
2016-10-08 10:22:04 +02:00
Nikita Popov 9c1c8be7a2 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-08 01:10:37 +02:00
Nikita Popov 159de7723e Merge branch 'PHP-5.6' into PHP-7.0 2016-10-08 01:06:02 +02:00
Nikita Popov b061fa909d Fix bug #73192 2016-10-08 01:04:22 +02:00
Nikita Popov bc3a0b82b8 Revert "Fixed test"
This reverts commit a10d03ac16.
2016-10-08 00:43:36 +02:00
Nikita Popov 1c468ee044 Revert "Added validation to parse_url() to prohibit restricted characters inside login/pass components based on RFC3986"
This reverts commit 085dfca02b.
2016-10-08 00:43:17 +02:00
Christoph M. Becker 14d4ee93a8 Implement #65038: IMAGETYPE_WEBP constant missing
We add WebP support for getimagesize(), getimagesizefromstring)(),
image_type_to_extension() and image_type_to_mime_type(). For now we
care only about the simple lossy WebP format (VP8) and ignore the
lossless (VP8L) and extended (VP8X) formats. We use image/webp as MIME
type as it appears to be pretty common, even though it is not yet
registered with IANA.

Relevant specifications:
 * <https://developers.google.com/speed/webp/docs/riff_container>
 * <https://tools.ietf.org/html/rfc6386>
2016-10-08 00:02:21 +02:00
Derick Rethans e3271b1814 Fixed bug #64887 (Allow DateTime modification with subsecond items). 2016-10-07 13:40:06 -04:00
Christoph M. Becker 825e0fd430 Document that ext/shmop deals with resources as of PHP 7.0.0
Second attempt
2016-10-07 16:35:37 +02:00
Christoph M. Becker 3afdf9e439 Merge branch 'PHP-7.0' into PHP-7.1 2016-10-07 16:21:52 +02:00
Christoph M. Becker 88d0201a89 Document that ext/shmop deals with resources as of PHP 7.0.0 2016-10-07 16:13:24 +02:00
Dmitry Stogov b2d53e47ed Updated reference-counting inferece rules.
The previous rules refected PHP-5 behavior and were completely wrong for PHP-7. (e.g. scalars don't have reference counters at all).
This change shouldn't affect anything, because results of this inference are not used yet.
2016-10-06 11:08:01 +03:00
Derick Rethans 55626549d8 Improve support for microseconds with Date/Time
It fixes several bugs:

- Fixed bug #45554 (Inconsistent behavior of the u format char).
- Fixed bug #48225 (DateTime parser doesn't set microseconds for "now").
- Fixed bug #52514 (microseconds are missing in DateTime class).
- Fixed bug #52519 (microseconds in DateInterval are missing).
- Fixed bug #68506 (General DateTime improvments needed for microseconds to become useful).
- Fixed bug #73109 (timelib_meridian doesn't parse dots correctly).
- Fixed bug #73247 (DateTime constructor does not initialise microseconds property).

It also updates timelib to 2016.04, and updates a data mapping file, which
causes changes to the volatile abbreviations tests.
2016-10-05 15:03:06 -04:00
Anatol Belski d5b77d6662 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix bug #73037, second round
2016-10-05 15:04:55 +02:00
Anatol Belski 5b79e95f7b Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix bug #73037, second round
2016-10-05 15:03:38 +02:00
Anatol Belski 07546496b1 Fix bug #73037, second round 2016-10-05 14:54:06 +02:00
Stanislav Malyshev 56e19b7c75 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed test
  Added validation to parse_url() to prohibit restricted characters inside login/pass components based on RFC3986
  Apparently negative wordwrap is a thing and should work as length = 0.
2016-10-04 21:56:28 -07:00
Ilia Alshanetsky a10d03ac16 Fixed test 2016-10-04 21:20:38 -07:00
Ilia Alshanetsky 085dfca02b Added validation to parse_url() to prohibit restricted characters inside login/pass components based on RFC3986 2016-10-04 21:20:31 -07:00
Craig Duncan 6e31aad8b8 Skip tests that rely on sessions if sessions aren't available 2016-10-04 20:51:18 +01:00
Stanislav Malyshev 8ea01d5f19 Apparently negative wordwrap is a thing and should work as length = 0.
I'll leave it as is for now.
2016-10-03 19:17:42 -07:00
Stanislav Malyshev 631173aa5c Really fix bug #73017 2016-10-03 18:07:21 -07:00