]> granicus.if.org Git - php/log
php
5 years agoRemove unused mmap_file + mmap_len from basic_globals
Nikita Popov [Fri, 27 Sep 2019 10:19:31 +0000 (12:19 +0200)]
Remove unused mmap_file + mmap_len from basic_globals

5 years agoAdd test for illegal unset/isset offset
Nikita Popov [Thu, 26 Sep 2019 15:04:43 +0000 (17:04 +0200)]
Add test for illegal unset/isset offset

Weirdly these warnings had zero coverage previously...

Remove an incorrect exception checking optimization: The key
lookup may throw (it could also throw previously, though only
through a custom error handler).

5 years agoConvert "Illegal offset type" warnings to exceptions
Nikita Popov [Thu, 26 Sep 2019 14:45:54 +0000 (16:45 +0200)]
Convert "Illegal offset type" warnings to exceptions

5 years agoConvert "cannot add element" warning to exception
Nikita Popov [Thu, 26 Sep 2019 14:05:24 +0000 (16:05 +0200)]
Convert "cannot add element" warning to exception

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Fri, 27 Sep 2019 10:52:52 +0000 (12:52 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix skipif.inc

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Fri, 27 Sep 2019 10:52:14 +0000 (12:52 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix skipif.inc

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Fri, 27 Sep 2019 10:51:21 +0000 (12:51 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix skipif.inc

5 years agoFix skipif.inc
Christoph M. Becker [Fri, 27 Sep 2019 10:50:04 +0000 (12:50 +0200)]
Fix skipif.inc

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 27 Sep 2019 09:20:48 +0000 (11:20 +0200)]
Merge branch 'PHP-7.4'

5 years agoXFAIL sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt
Nikita Popov [Fri, 27 Sep 2019 09:18:50 +0000 (11:18 +0200)]
XFAIL sapi/fpm/tests/log-bwd-multiple-msgs-stdout-stderr.phpt

This is supposed to be addressed by GH-4007, but that seems stalled
for now.

5 years agoEnable ubsan stack trace printing on community job
Nikita Popov [Fri, 27 Sep 2019 09:16:22 +0000 (11:16 +0200)]
Enable ubsan stack trace printing on community job

Try to do this using "variables" -- apparently these get uppercased
and are made available as environment variables.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 27 Sep 2019 09:12:13 +0000 (11:12 +0200)]
Merge branch 'PHP-7.4'

5 years agoFix file clash in rename_variation.phpt
Nikita Popov [Fri, 27 Sep 2019 09:10:42 +0000 (11:10 +0200)]
Fix file clash in rename_variation.phpt

rename_variation2.tmp is ... unsurprisingly ... already used by
rename_variation2.phpt. Alternatively it could be placed in the
directory that the test creates, but maybe this is intended to
test cross-directory renames, so I'll leave it.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Fri, 27 Sep 2019 08:49:25 +0000 (10:49 +0200)]
Merge branch 'PHP-7.4'

5 years agoHandle resources used as array keys consistently
Nikita Popov [Fri, 27 Sep 2019 08:39:21 +0000 (10:39 +0200)]
Handle resources used as array keys consistently

Resources used as array keys are generally handled by throwing a
notice and converting the resource to the resource handle. The only
exception is the [$resource => null] syntax, where this was treated
as an illegal offset type instead. However, this also only happened
for VM evaluations, the AST evaluator did handle resources correctly.

5 years agoThrow Error when writing property of non-object
Nikita Popov [Thu, 26 Sep 2019 10:22:48 +0000 (12:22 +0200)]
Throw Error when writing property of non-object

This removes object auto-vivification support.

This also means that we can remove the corresponding special
handling for typed properites: We no longer need to check that a
property is convertible to stdClass if such a conversion might
take place indirectly due to a nested property write.

Additionally OBJ_W style operations now no longer modify the
object operand, and as such we no longer need to treat op1 as a
def in SSA form.

The next step would be to actually compile the whole LHS of OBJ_W
operations in R rather than W mode, but that causes issues with
SimpleXML, whose object handlers depend on the current compilation
structure.

Part of https://wiki.php.net/rfc/engine_warnings.

5 years agoUpdate opcache zend_func_info after wbmp/xml_parser changes
Tyson Andre [Thu, 26 Sep 2019 23:58:34 +0000 (19:58 -0400)]
Update opcache zend_func_info after wbmp/xml_parser changes

See UPGRADING on the master branch.

```
- GD:
  . The deprecated function image2wbmp() has been removed.
    RFC: https://wiki.php.net/rfc/image2wbmp
  . The deprecated functions png2wbmp() and jpeg2wbmp() have been removed.
    RFC: https://wiki.php.net/rfc/deprecate-png-jpeg-2wbmp
- XML:
  . xml_parser_create(_ns) will now return an XmlParser object rather than a
    resource.
```

5 years agoDon't generate useless stubs
Dmitry Stogov [Thu, 26 Sep 2019 20:21:48 +0000 (23:21 +0300)]
Don't generate useless stubs

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 26 Sep 2019 11:50:02 +0000 (13:50 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 26 Sep 2019 11:47:41 +0000 (13:47 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 26 Sep 2019 11:47:19 +0000 (13:47 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix memory leak with ** on array operands
Nikita Popov [Thu, 26 Sep 2019 11:45:45 +0000 (13:45 +0200)]
Fix memory leak with ** on array operands

5 years agoLimit max length for parser fuzzer
Nikita Popov [Thu, 26 Sep 2019 08:45:47 +0000 (10:45 +0200)]
Limit max length for parser fuzzer

We're getting some very large inputs (~500KB) on OSS-Fuzz, which
slot down performance a lot. Let's try limiting this, starting
with a still fairly large value of 64KB.

Also remove the max_execution_time limit, so that slow test cases
cause a genuine libfuzzer timeout and we may investigate them.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Thu, 26 Sep 2019 08:26:12 +0000 (10:26 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 26 Sep 2019 08:25:55 +0000 (10:25 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 26 Sep 2019 08:25:40 +0000 (10:25 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix null-pointer deref in if stmt printing
Nikita Popov [Thu, 26 Sep 2019 08:24:49 +0000 (10:24 +0200)]
Fix null-pointer deref in if stmt printing

Fixes OSS-Fuzz #17721.

5 years agoAvoid code dupliction
Dmitry Stogov [Wed, 25 Sep 2019 22:40:30 +0000 (01:40 +0300)]
Avoid code dupliction

5 years agoMerge branch 'PHP-7.4'
Dmitry Stogov [Wed, 25 Sep 2019 22:20:48 +0000 (01:20 +0300)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed GOTO VM

5 years agoFixed GOTO VM
Dmitry Stogov [Wed, 25 Sep 2019 22:17:54 +0000 (01:17 +0300)]
Fixed GOTO VM

5 years agoCleanup CFG optimization
Dmitry Stogov [Wed, 25 Sep 2019 14:30:59 +0000 (17:30 +0300)]
Cleanup CFG optimization

5 years agoAdding ldap stubs for arginfo
Stephen Reay [Mon, 23 Sep 2019 07:43:56 +0000 (09:43 +0200)]
Adding ldap stubs for arginfo

5 years agoRemove mention of PHP major version in Copyright headers
Gabriel Caruso [Tue, 24 Sep 2019 21:54:04 +0000 (23:54 +0200)]
Remove mention of PHP major version in Copyright headers

Closes GH-4732.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 25 Sep 2019 09:03:19 +0000 (11:03 +0200)]
Merge branch 'PHP-7.4'

5 years agoIncrease serialize_lock while decoding session
Nikita Popov [Wed, 25 Sep 2019 09:02:23 +0000 (11:02 +0200)]
Increase serialize_lock while decoding session

Avoid leaking state between Serializable::unserialize() and
session_decode().

5 years agoRemove xfail on bug70219.phpt
Nikita Popov [Wed, 25 Sep 2019 08:56:27 +0000 (10:56 +0200)]
Remove xfail on bug70219.phpt

Looks like this is working as it's supposed to, the test expectation
just needs to be adjusted.

5 years agoJust return on throwing ZPP
Christoph M. Becker [Wed, 25 Sep 2019 08:38:32 +0000 (10:38 +0200)]
Just return on throwing ZPP

5 years agoAdd missing zend_parse_parameters_none()
Christoph M. Becker [Wed, 25 Sep 2019 08:37:36 +0000 (10:37 +0200)]
Add missing zend_parse_parameters_none()

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 25 Sep 2019 08:35:26 +0000 (10:35 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 25 Sep 2019 08:34:33 +0000 (10:34 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 25 Sep 2019 08:34:25 +0000 (10:34 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoAdd SimpleXML arginfo stubs
Stephen Reay [Wed, 18 Sep 2019 06:33:51 +0000 (08:33 +0200)]
Add SimpleXML arginfo stubs

5 years agoFix hash key length in umsg_parse_format()
Jinesh Patel [Mon, 29 Jul 2019 18:19:52 +0000 (14:19 -0400)]
Fix hash key length in umsg_parse_format()

Fix array length passed to zend_hash_str_find_ptr() casting from
UChar array to char array requires mul by sizeof(UChar).

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Wed, 25 Sep 2019 08:19:34 +0000 (10:19 +0200)]
Merge branch 'PHP-7.4'

5 years agoFix GCOV not working for PHP-7.4 and master branches
Gerard Roche [Mon, 23 Sep 2019 16:09:00 +0000 (17:09 +0100)]
Fix GCOV not working for PHP-7.4 and master branches

Code coverage reports (`make lcov`), since commit eef8522 (7.4 branch),
generates incorrect coverage and emits warnings. Simplifying the
Makefile.gcov file has the side-effect of resolving the issue.

    Processing sapi/cli/php_http_parser.gcda
    php-src/lcov_data/sapi/cli/php_http_parser.gcda:stamp mismatch with notes file
    geninfo: WARNING: gcov did not create any files for php-src/lcov_data/sapi/cli/php_http_parser.gcda!
    ...
    Processing ext/mbstring/mb_gpc.gcda
    php-src/lcov_data/ext/mbstring/mb_gpc.gcda:stamp mismatch with notes file
    geninfo: WARNING: gcov did not create any files for php-src/lcov_data/ext/mbstring/mb_gpc.gcda!

Closes: https://bugs.php.net/bug.php?id=52718.
See also: https://bugs.php.net/bug.php?id=78288.

5 years agoMerge branch 'PHP-7.4'
Gabriel Caruso [Tue, 24 Sep 2019 22:07:09 +0000 (00:07 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Use nproc instead of hardcoded number

5 years agoUse nproc instead of hardcoded number
Gabriel Caruso [Sun, 15 Sep 2019 16:32:11 +0000 (18:32 +0200)]
Use nproc instead of hardcoded number

5 years ago[ci skip] Update UPGRADING.INTERNALS
Christoph M. Becker [Tue, 24 Sep 2019 14:20:18 +0000 (16:20 +0200)]
[ci skip] Update UPGRADING.INTERNALS

Cf. <http://git.php.net/?p=php-src.git;a=commit;h=0c7124e6beff0a7b0540691db370148be06d242a>.

5 years agoAdd check_only parameter to get_closure handler
Christoph M. Becker [Mon, 23 Sep 2019 21:48:36 +0000 (23:48 +0200)]
Add check_only parameter to get_closure handler

`get_closure` handlers are called to check whether an object is
callable, and to actually get the closure, respectively.  The behavior
of the handler might differ for these two cases, particularly the
handler may throw in the latter case, but should not in the former.

Therefore we add a `check_only` parameter, to be able to distinguish
the desired purpose.

5 years agoAdd new entries for exif and unserialize fuzzing corpus
Nikita Popov [Tue, 24 Sep 2019 10:34:30 +0000 (12:34 +0200)]
Add new entries for exif and unserialize fuzzing corpus

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Tue, 24 Sep 2019 10:19:14 +0000 (12:19 +0200)]
Merge branch 'PHP-7.4'

5 years agoFixed bug #78589
Nikita Popov [Mon, 23 Sep 2019 10:39:12 +0000 (12:39 +0200)]
Fixed bug #78589

Don't protect GC while destroying zvals. We may need to add GC
roots during this phase.

5 years agoAvoid signed shift
Nikita Popov [Tue, 24 Sep 2019 09:32:21 +0000 (11:32 +0200)]
Avoid signed shift

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Tue, 24 Sep 2019 09:16:08 +0000 (11:16 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Update NEWS

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Tue, 24 Sep 2019 09:15:28 +0000 (11:15 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Update NEWS

5 years agoUpdate NEWS
Christoph M. Becker [Tue, 24 Sep 2019 09:13:55 +0000 (11:13 +0200)]
Update NEWS

5 years agoMerge branch 'PHP-7.4'
Stanislav Malyshev [Tue, 24 Sep 2019 04:51:26 +0000 (21:51 -0700)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #78559: Heap buffer overflow in mb_eregi

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Stanislav Malyshev [Tue, 24 Sep 2019 04:51:12 +0000 (21:51 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78559: Heap buffer overflow in mb_eregi

5 years agoFix #78559: Heap buffer overflow in mb_eregi
Christoph M. Becker [Fri, 20 Sep 2019 17:02:22 +0000 (19:02 +0200)]
Fix #78559: Heap buffer overflow in mb_eregi

We backport kkos/oniguruma@d3e402928b6eb3327f8f7d59a9edfa622fec557b.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Mon, 23 Sep 2019 21:04:26 +0000 (23:04 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix NEWS entry

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Christoph M. Becker [Mon, 23 Sep 2019 21:03:55 +0000 (23:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix NEWS entry

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Mon, 23 Sep 2019 21:01:38 +0000 (23:01 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix NEWS entry

5 years agoFix NEWS entry
Christoph M. Becker [Mon, 23 Sep 2019 20:59:55 +0000 (22:59 +0200)]
Fix NEWS entry

Cf. <https://bugs.php.net/78590>.

5 years agoUse cheaper code for scalar type check
Dmitry Stogov [Mon, 23 Sep 2019 20:04:08 +0000 (23:04 +0300)]
Use cheaper code for scalar type check

5 years agoChange ZEND_RECV and ZEND_RECV_VARIADIC to use extended_value for cache slot (instead...
Dmitry Stogov [Mon, 23 Sep 2019 19:28:56 +0000 (22:28 +0300)]
Change ZEND_RECV and ZEND_RECV_VARIADIC to use extended_value for cache slot (instead of op2), to be consistent with ZEND_RECV_INIT.

5 years agoCheck that type is set in ZEND_TYPE_IS_MASK()
Nikita Popov [Mon, 23 Sep 2019 17:41:00 +0000 (19:41 +0200)]
Check that type is set in ZEND_TYPE_IS_MASK()

Allow this macro to be used without an explicit ZEND_TYPE_IS_SET()
check.

5 years agoCleanup ext/dom: Additional unimplemented code following 25bfac4
Benjamin Eberlei [Sun, 22 Sep 2019 21:15:18 +0000 (23:15 +0200)]
Cleanup ext/dom: Additional unimplemented code following 25bfac4

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 23 Sep 2019 15:18:45 +0000 (17:18 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 15:18:39 +0000 (17:18 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 23 Sep 2019 15:18:33 +0000 (17:18 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix skipif condition
Nikita Popov [Mon, 23 Sep 2019 15:17:52 +0000 (17:17 +0200)]
Fix skipif condition

5 years agoUse ZEND_TYPE_IS_SET() when checking for property types
Nikita Popov [Mon, 23 Sep 2019 14:53:54 +0000 (16:53 +0200)]
Use ZEND_TYPE_IS_SET() when checking for property types

Instead of a simple if or 0 comparison. This would no longer work
if zend_type is a struct.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 23 Sep 2019 14:43:04 +0000 (16:43 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 14:42:59 +0000 (16:42 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 23 Sep 2019 14:42:33 +0000 (16:42 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoSkip test on 32-bit
Nikita Popov [Mon, 23 Sep 2019 14:42:24 +0000 (16:42 +0200)]
Skip test on 32-bit

5 years agoDon't set nullability flag for parameters without type
Nikita Popov [Mon, 23 Sep 2019 14:33:24 +0000 (16:33 +0200)]
Don't set nullability flag for parameters without type

Use value 0 instead. To compensate we check in ReflectionParameter
allowsNull() whether the type is set at all: If it isn't, it always
allows null.

This removes a discrepancy between internal&userland functions:
For userland functions allowsNull() on untyped parameters returned
true, but for internal functions it returned false.

5 years agoUpdate error messages in some more tests
Nikita Popov [Mon, 23 Sep 2019 14:29:46 +0000 (16:29 +0200)]
Update error messages in some more tests

5 years agoCanonicalize typed prop/param default value errors
Nikita Popov [Mon, 23 Sep 2019 14:12:18 +0000 (16:12 +0200)]
Canonicalize typed prop/param default value errors

Use shared logic to determine what values are valid, and a single
error message format.

5 years agoCheck for nullable void type earlier
Nikita Popov [Mon, 23 Sep 2019 13:59:47 +0000 (15:59 +0200)]
Check for nullable void type earlier

5 years agoCanonicalize typed properties error message
Nikita Popov [Mon, 23 Sep 2019 13:48:49 +0000 (15:48 +0200)]
Canonicalize typed properties error message

We have lots of other typed properties related error messages of
the form "assign X to typed property Y::$z of type A", so use th
same format for the primary message as well. Special-casing things
like classes and nullability is not going to scale with future
type-system extensions, and I don't think it really adds clarity
either.

5 years agoStandardize type printing in reflection
Nikita Popov [Fri, 20 Sep 2019 13:33:56 +0000 (15:33 +0200)]
Standardize type printing in reflection

Use ?T instead of "T or NULL".

5 years agoChange representation of zend_type from type code to MAY_BE_* mask
Nikita Popov [Thu, 19 Sep 2019 10:11:29 +0000 (12:11 +0200)]
Change representation of zend_type from type code to MAY_BE_* mask

This switches zend_type from storing a single IS_* type code to
storing a MAY_BE_* type mask. Right now most code still assumes
that there is only a single type in the mask (or two together
with MAY_BE_NULL). But this will make it a lot simpler to introduce
union types.

An additional advantage (and why I'm doing this separately), is
that a number of special cases no longer need to be handled
separately: We can do a single mask & (1 << type) check to handle
all simple types, booleans (true|false) and null.

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 23 Sep 2019 12:52:45 +0000 (14:52 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 12:52:40 +0000 (14:52 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoSkip test on 32-bit
Nikita Popov [Mon, 23 Sep 2019 12:52:32 +0000 (14:52 +0200)]
Skip test on 32-bit

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 23 Sep 2019 11:47:43 +0000 (13:47 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 11:47:38 +0000 (13:47 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoCommit regenerated var_unserializer.c
Nikita Popov [Mon, 23 Sep 2019 11:47:05 +0000 (13:47 +0200)]
Commit regenerated var_unserializer.c

5 years agoRemove commented code
Nikita Popov [Mon, 23 Sep 2019 11:34:42 +0000 (13:34 +0200)]
Remove commented code

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 23 Sep 2019 11:19:05 +0000 (13:19 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 11:18:59 +0000 (13:18 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 23 Sep 2019 11:18:39 +0000 (13:18 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix signed integer overflow in SplObjectStorage unserialization
Nikita Popov [Mon, 23 Sep 2019 11:16:58 +0000 (13:16 +0200)]
Fix signed integer overflow in SplObjectStorage unserialization

If count is ZEND_LONG_MIN the count-- loop underflows. This is
ultimately harmless, but results in a ubsan warning.

Fix this by adding a sanity check that the count isn't negative,
because that doesn't make sense...

5 years agoMerge branch 'PHP-7.4'
Nikita Popov [Mon, 23 Sep 2019 11:09:12 +0000 (13:09 +0200)]
Merge branch 'PHP-7.4'

5 years agoMerge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 23 Sep 2019 11:09:01 +0000 (13:09 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4

5 years agoFix ubsan violation in parse_iv2
Nikita Popov [Mon, 23 Sep 2019 11:06:55 +0000 (13:06 +0200)]
Fix ubsan violation in parse_iv2

This fixes two issues:
 * Negative the value in an unsigned type to avoid signed overflow.
 * Treat -0 as 0 rather than an invalid number that gets converted
   to ZEND_LONG_MIN.

5 years agoMerge branch 'PHP-7.4'
Christoph M. Becker [Mon, 23 Sep 2019 07:54:59 +0000 (09:54 +0200)]
Merge branch 'PHP-7.4'

* PHP-7.4:
  Allow lookup of distro-packaged QDBM headers on Debian

5 years agoAllow lookup of distro-packaged QDBM headers on Debian
Stephen Reay [Sun, 22 Sep 2019 15:51:36 +0000 (22:51 +0700)]
Allow lookup of distro-packaged QDBM headers on Debian

5 years agoAdded arginfo stubs for IMAP extension
Stephen Reay [Sun, 22 Sep 2019 16:13:35 +0000 (18:13 +0200)]
Added arginfo stubs for IMAP extension