]>
granicus.if.org Git - php/log
Christoph M. Becker [Sun, 29 Sep 2019 11:52:21 +0000 (13:52 +0200)]
Properly clean up files created by test cases
Christoph M. Becker [Sun, 29 Sep 2019 11:49:36 +0000 (13:49 +0200)]
Add missing zend_parse_parameters_none()
Christoph M. Becker [Sun, 29 Sep 2019 10:02:07 +0000 (12:02 +0200)]
Add ZipArchive arginfo stubs
Christoph M. Becker [Sun, 29 Sep 2019 11:39:15 +0000 (13:39 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix build for libzip < 0.11.2
Christoph M. Becker [Sun, 29 Sep 2019 11:38:28 +0000 (13:38 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix build for libzip < 0.11.2
Christoph M. Becker [Sun, 29 Sep 2019 11:34:16 +0000 (13:34 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix build for libzip < 0.11.2
Christoph M. Becker [Sun, 29 Sep 2019 11:31:22 +0000 (13:31 +0200)]
Fix build for libzip < 0.11.2
We must not define method entries, if the actual method definitions or
the arginfo structures are not defined.
Nikita Popov [Sun, 29 Sep 2019 09:33:45 +0000 (11:33 +0200)]
Don't use asm arithmetic under msan
Clang 9 supports asm goto, so these no longer get automatically
skipped.
Craig Duncan [Sun, 22 Sep 2019 14:21:51 +0000 (15:21 +0100)]
Convert libxml arginfo to php stubs
Nikita Popov [Sat, 28 Sep 2019 19:30:15 +0000 (21:30 +0200)]
Merge branch 'PHP-7.4'
Tyson Andre [Sat, 28 Sep 2019 13:54:43 +0000 (09:54 -0400)]
Reduce memory used by token_get_all()
Around a quarter of all strings in array tokens would have a string that's one
character long (e.g. ` `, `\`, `1`)
For parsing a large number of php files,
The memory increase dropped from
378374248 to
369535688 (2.5%)
Closes GH-4753.
Nikita Popov [Sat, 28 Sep 2019 15:17:36 +0000 (17:17 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Sat, 28 Sep 2019 15:17:18 +0000 (17:17 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Sat, 28 Sep 2019 15:15:36 +0000 (17:15 +0200)]
Don't throw warnings during heredoc scan-ahead
Otherwise these warnings will turn up twice (or more...)
Christoph M. Becker [Sat, 28 Sep 2019 13:33:27 +0000 (15:33 +0200)]
Add ext/snmp arginfo stubs
Christoph M. Becker [Sat, 28 Sep 2019 11:39:40 +0000 (13:39 +0200)]
Don't return explicit value on failing ZPP
Christoph M. Becker [Sat, 28 Sep 2019 11:33:46 +0000 (13:33 +0200)]
Add missing zend_parse_parameters_none()
Nikita Popov [Fri, 27 Sep 2019 20:31:35 +0000 (22:31 +0200)]
Make fuzzing sapi i386 compatible
* Avoid an unnecessary -lstdc++ dependency. It's not going to be
used in the end anyway, and is an unnecessary hassle to set up.
* Use $LIB_FUZZING_ENGINE instead of hardcoding -lFuzzingEngine.
Nikita Popov [Fri, 27 Sep 2019 15:47:56 +0000 (17:47 +0200)]
Remove unused zend_del_literal() function
Christoph M. Becker [Fri, 27 Sep 2019 21:02:51 +0000 (23:02 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix wrong function name in SKIPIF
Fabien Villepinte [Fri, 27 Sep 2019 14:12:13 +0000 (16:12 +0200)]
Fix wrong function name in SKIPIF
Christoph M. Becker [Fri, 27 Sep 2019 17:16:35 +0000 (19:16 +0200)]
More ZPP warning to error related test fixes
Christoph M. Becker [Fri, 27 Sep 2019 17:07:29 +0000 (19:07 +0200)]
Fix tests wrt. ZPP warnings to errors
Since these test parts are solely about checking ZPP, we drop them
altogether.
Christoph M. Becker [Fri, 27 Sep 2019 14:35:40 +0000 (16:35 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix test regarding Reflection::export() deprecation
Christoph M. Becker [Fri, 27 Sep 2019 14:31:49 +0000 (16:31 +0200)]
Fix test regarding Reflection::export() deprecation
Christoph M. Becker [Fri, 27 Sep 2019 14:14:50 +0000 (16:14 +0200)]
Initialize variables
These variables may not be initialized otherwise, but are passed to
another function; although it seems they are not used there, if not
having been initialized, MSVC complains.
Christoph M. Becker [Fri, 27 Sep 2019 14:05:17 +0000 (16:05 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix SKIPIF in ext/mysqli
Christoph M. Becker [Fri, 27 Sep 2019 14:04:35 +0000 (16:04 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix SKIPIF in ext/mysqli
Christoph M. Becker [Fri, 27 Sep 2019 14:04:00 +0000 (16:04 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix SKIPIF in ext/mysqli
Fabien Villepinte [Fri, 27 Sep 2019 12:06:17 +0000 (14:06 +0200)]
Fix SKIPIF in ext/mysqli
Nikita Popov [Fri, 27 Sep 2019 12:52:20 +0000 (14:52 +0200)]
Convert "Only arrays and Traversables can be unpacked" into Error
Nikita Popov [Fri, 27 Sep 2019 12:47:23 +0000 (14:47 +0200)]
Promote write "use scalar as array" warning to Error
Nikita Popov [Fri, 27 Sep 2019 10:19:31 +0000 (12:19 +0200)]
Remove unused mmap_file + mmap_len from basic_globals
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).
Nikita Popov [Thu, 26 Sep 2019 14:45:54 +0000 (16:45 +0200)]
Convert "Illegal offset type" warnings to exceptions
Nikita Popov [Thu, 26 Sep 2019 14:05:24 +0000 (16:05 +0200)]
Convert "cannot add element" warning to exception
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
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
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
Christoph M. Becker [Fri, 27 Sep 2019 10:50:04 +0000 (12:50 +0200)]
Fix skipif.inc
Nikita Popov [Fri, 27 Sep 2019 09:20:48 +0000 (11:20 +0200)]
Merge branch 'PHP-7.4'
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.
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.
Nikita Popov [Fri, 27 Sep 2019 09:12:13 +0000 (11:12 +0200)]
Merge branch 'PHP-7.4'
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.
Nikita Popov [Fri, 27 Sep 2019 08:49:25 +0000 (10:49 +0200)]
Merge branch 'PHP-7.4'
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.
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.
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.
```
Dmitry Stogov [Thu, 26 Sep 2019 20:21:48 +0000 (23:21 +0300)]
Don't generate useless stubs
Nikita Popov [Thu, 26 Sep 2019 11:50:02 +0000 (13:50 +0200)]
Merge branch '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
Nikita Popov [Thu, 26 Sep 2019 11:47:19 +0000 (13:47 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 26 Sep 2019 11:45:45 +0000 (13:45 +0200)]
Fix memory leak with ** on array operands
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.
Nikita Popov [Thu, 26 Sep 2019 08:26:12 +0000 (10:26 +0200)]
Merge branch '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
Nikita Popov [Thu, 26 Sep 2019 08:25:40 +0000 (10:25 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
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.
Dmitry Stogov [Wed, 25 Sep 2019 22:40:30 +0000 (01:40 +0300)]
Avoid code dupliction
Dmitry Stogov [Wed, 25 Sep 2019 22:20:48 +0000 (01:20 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed GOTO VM
Dmitry Stogov [Wed, 25 Sep 2019 22:17:54 +0000 (01:17 +0300)]
Fixed GOTO VM
Dmitry Stogov [Wed, 25 Sep 2019 14:30:59 +0000 (17:30 +0300)]
Cleanup CFG optimization
Stephen Reay [Mon, 23 Sep 2019 07:43:56 +0000 (09:43 +0200)]
Adding ldap stubs for arginfo
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.
Nikita Popov [Wed, 25 Sep 2019 09:03:19 +0000 (11:03 +0200)]
Merge branch 'PHP-7.4'
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().
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.
Christoph M. Becker [Wed, 25 Sep 2019 08:38:32 +0000 (10:38 +0200)]
Just return on throwing ZPP
Christoph M. Becker [Wed, 25 Sep 2019 08:37:36 +0000 (10:37 +0200)]
Add missing zend_parse_parameters_none()
Nikita Popov [Wed, 25 Sep 2019 08:35:26 +0000 (10:35 +0200)]
Merge branch '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
Nikita Popov [Wed, 25 Sep 2019 08:34:25 +0000 (10:34 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Stephen Reay [Wed, 18 Sep 2019 06:33:51 +0000 (08:33 +0200)]
Add SimpleXML arginfo stubs
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).
Nikita Popov [Wed, 25 Sep 2019 08:19:34 +0000 (10:19 +0200)]
Merge branch 'PHP-7.4'
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.
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
Gabriel Caruso [Sun, 15 Sep 2019 16:32:11 +0000 (18:32 +0200)]
Use nproc instead of hardcoded number
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 >.
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.
Nikita Popov [Tue, 24 Sep 2019 10:34:30 +0000 (12:34 +0200)]
Add new entries for exif and unserialize fuzzing corpus
Nikita Popov [Tue, 24 Sep 2019 10:19:14 +0000 (12:19 +0200)]
Merge branch 'PHP-7.4'
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.
Nikita Popov [Tue, 24 Sep 2019 09:32:21 +0000 (11:32 +0200)]
Avoid signed shift
Christoph M. Becker [Tue, 24 Sep 2019 09:16:08 +0000 (11:16 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS
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
Christoph M. Becker [Tue, 24 Sep 2019 09:13:55 +0000 (11:13 +0200)]
Update NEWS
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
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
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 .
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
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
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
Christoph M. Becker [Mon, 23 Sep 2019 20:59:55 +0000 (22:59 +0200)]
Fix NEWS entry
Cf. <https://bugs.php.net/78590>.
Dmitry Stogov [Mon, 23 Sep 2019 20:04:08 +0000 (23:04 +0300)]
Use cheaper code for scalar type check
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.
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.
Benjamin Eberlei [Sun, 22 Sep 2019 21:15:18 +0000 (23:15 +0200)]
Cleanup ext/dom: Additional unimplemented code following
25bfac4
Nikita Popov [Mon, 23 Sep 2019 15:18:45 +0000 (17:18 +0200)]
Merge branch 'PHP-7.4'