]>
granicus.if.org Git - php/log
Nikita Popov [Thu, 19 Dec 2019 10:48:20 +0000 (11:48 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Avoid signed integer overflow in string offset check
Nikita Popov [Thu, 19 Dec 2019 10:46:14 +0000 (11:46 +0100)]
Avoid signed integer overflow in string offset check
Cast to size_t before performing operations instead of afterwards.
Nikita Popov [Thu, 19 Dec 2019 09:43:23 +0000 (10:43 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add destructor annotations in ini parser
Nikita Popov [Thu, 19 Dec 2019 09:43:14 +0000 (10:43 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add destructor annotations in ini parser
Nikita Popov [Thu, 19 Dec 2019 09:42:10 +0000 (10:42 +0100)]
Add destructor annotations in ini parser
It would be better to switch this to use %union and %type annotations,
but not going to do that change for 7.3.
Nikita Popov [Wed, 18 Dec 2019 16:18:46 +0000 (17:18 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix leak in assign_ref with function
Nikita Popov [Wed, 18 Dec 2019 16:18:10 +0000 (17:18 +0100)]
Fix leak in assign_ref with function
As far as I can see, the retval copying is already done in all
callers of this function, so it should not be duplicated here.
Nikita Popov [Wed, 18 Dec 2019 14:56:10 +0000 (15:56 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78776
Nikita Popov [Wed, 18 Dec 2019 14:53:09 +0000 (15:53 +0100)]
Fixed bug #78776
By using the normal inheritance check if the parent is abstract
as well.
Remi Collet [Wed, 18 Dec 2019 13:18:16 +0000 (14:18 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix release date
fix release date
fix release date
Remi Collet [Wed, 18 Dec 2019 13:18:03 +0000 (14:18 +0100)]
fix release date
Remi Collet [Wed, 18 Dec 2019 13:17:49 +0000 (14:17 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
fix release date
fix release date
Remi Collet [Wed, 18 Dec 2019 13:17:31 +0000 (14:17 +0100)]
fix release date
Remi Collet [Wed, 18 Dec 2019 13:17:21 +0000 (14:17 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
fix release date
Remi Collet [Wed, 18 Dec 2019 13:16:19 +0000 (14:16 +0100)]
fix release date
Nikita Popov [Wed, 18 Dec 2019 10:41:11 +0000 (11:41 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78986
Nikita Popov [Wed, 18 Dec 2019 10:37:39 +0000 (11:37 +0100)]
Fixed bug #78986
Don't assume that handlers live in the arena, they may also be in
SHM.
Fabien Villepinte [Wed, 18 Dec 2019 10:10:10 +0000 (11:10 +0100)]
Merge branch 'PHP-7.4'
Fabien Villepinte [Wed, 18 Dec 2019 10:08:24 +0000 (11:08 +0100)]
Add CONFLICTS tag
These tests can be the reason file_get_contents_variation8.phpt fails times to times.
Nikita Popov [Wed, 18 Dec 2019 10:04:51 +0000 (11:04 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Rethrow generator exception even without active stack frame
Nikita Popov [Wed, 18 Dec 2019 10:04:46 +0000 (11:04 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Rethrow generator exception even without active stack frame
Nikita Popov [Wed, 18 Dec 2019 10:02:44 +0000 (11:02 +0100)]
Rethrow generator exception even without active stack frame
Finally blocks in generators may be invoked during shutdown, in
which case we don't have a stack frame. Similar to what
zend_call_function does, we still need to rethrow these exceptions,
otherwise they will be hidden (and leak).
Nikita Popov [Wed, 18 Dec 2019 09:24:41 +0000 (10:24 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix use-after-free when trying to write to closure property
Nikita Popov [Wed, 18 Dec 2019 09:24:02 +0000 (10:24 +0100)]
Fix use-after-free when trying to write to closure property
Nikita Popov [Wed, 18 Dec 2019 09:11:40 +0000 (10:11 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix freeing of dynamic call name
Nikita Popov [Wed, 18 Dec 2019 09:11:23 +0000 (10:11 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix freeing of dynamic call name
Nikita Popov [Wed, 18 Dec 2019 09:10:30 +0000 (10:10 +0100)]
Fix freeing of dynamic call name
We need to free op2 if the call construction fails.
Also remove a redundant check for !call.
Nikita Popov [Wed, 18 Dec 2019 08:54:18 +0000 (09:54 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix const/cv freeing on failed reference assignment
Nikita Popov [Wed, 18 Dec 2019 08:53:30 +0000 (09:53 +0100)]
Fix const/cv freeing on failed reference assignment
Christoph M. Becker [Tue, 17 Dec 2019 19:01:44 +0000 (20:01 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
More updates to CONTRIBUTING.md
Christoph M. Becker [Tue, 17 Dec 2019 19:01:18 +0000 (20:01 +0100)]
More updates to CONTRIBUTING.md
7.4 is stable.
Christoph M. Becker [Tue, 17 Dec 2019 18:58:46 +0000 (19:58 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update CONTRIBUTING.md
Christoph M. Becker [Tue, 17 Dec 2019 18:57:49 +0000 (19:57 +0100)]
Update CONTRIBUTING.md
7.1 is EOL; 7.2 is security fixes only.
Christoph M. Becker [Tue, 17 Dec 2019 16:53:44 +0000 (17:53 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78976: SplFileObject::fputcsv returns -1 on failure
Christoph M. Becker [Tue, 17 Dec 2019 16:52:18 +0000 (17:52 +0100)]
Fix #78976: SplFileObject::fputcsv returns -1 on failure
`php_stream_write()` returns `-1` on failure now, which has to be
catered to by `SplFileObject::fputcsv()` which still is supposed to
return `false` on failure.
Nikita Popov [Tue, 17 Dec 2019 15:58:10 +0000 (16:58 +0100)]
Fix leak of dynamic property name in address helper
Nikita Popov [Tue, 17 Dec 2019 15:47:49 +0000 (16:47 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Free buffer in php_verror even if it is empty
Nikita Popov [Tue, 17 Dec 2019 15:44:17 +0000 (16:44 +0100)]
Free buffer in php_verror even if it is empty
vspprintf allocates a buffer even if the resulting string is empty.
Nikita Popov [Tue, 17 Dec 2019 15:28:56 +0000 (16:28 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix resetting of internal_encoding and friends
Nikita Popov [Tue, 17 Dec 2019 15:26:42 +0000 (16:26 +0100)]
Fix resetting of internal_encoding and friends
We need to update the value even if new_value is NULL. In particular,
it should be reset back to NULL after each request if the setting was
not specified on startup. Otherwise we leave dangling pointers.
Dmitry Stogov [Tue, 17 Dec 2019 12:42:02 +0000 (15:42 +0300)]
Avoid generation of "jmp" to next instruction
Nikita Popov [Tue, 17 Dec 2019 12:26:32 +0000 (13:26 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Avoid float to int cast UB in exif
Nikita Popov [Tue, 17 Dec 2019 12:15:01 +0000 (13:15 +0100)]
Avoid float to int cast UB in exif
Dmitry Stogov [Tue, 17 Dec 2019 11:09:26 +0000 (14:09 +0300)]
Make "exception_handler_undef" stub to check EG(opline_before_exception) and undefine corresponnding result variable, if necessary.
This fixes few invalid "exception_handler_undef" usages.
Christoph M. Becker [Tue, 17 Dec 2019 09:05:40 +0000 (10:05 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update/fix NEWS [ci skip]
Christoph M. Becker [Tue, 17 Dec 2019 09:05:18 +0000 (10:05 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update/fix NEWS [ci skip]
Christoph M. Becker [Tue, 17 Dec 2019 08:51:30 +0000 (09:51 +0100)]
Update/fix NEWS [ci skip]
Christoph M. Becker [Tue, 17 Dec 2019 09:03:13 +0000 (10:03 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Update NEWS
[ci skip] Update NEWS
Fix test
Christoph M. Becker [Tue, 17 Dec 2019 09:02:43 +0000 (10:02 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
[ci skip] Update NEWS
[ci skip] Update NEWS
Fix test
Christoph M. Becker [Tue, 17 Dec 2019 09:01:50 +0000 (10:01 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] Update NEWS
Stanislav Malyshev [Tue, 17 Dec 2019 07:45:11 +0000 (23:45 -0800)]
[ci skip] Update NEWS
Stanislav Malyshev [Tue, 17 Dec 2019 07:41:04 +0000 (23:41 -0800)]
[ci skip] Update NEWS
Dmitry Stogov [Tue, 17 Dec 2019 07:13:13 +0000 (10:13 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Property names of internal classes from temporary extensins, loaded by dl(), may be emalloc-ed strings.
Dmitry Stogov [Tue, 17 Dec 2019 07:10:11 +0000 (10:10 +0300)]
Property names of internal classes from temporary extensins, loaded by dl(), may be emalloc-ed strings.
Dmitry Stogov [Tue, 17 Dec 2019 07:09:43 +0000 (10:09 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed memory leak
Dmitry Stogov [Tue, 17 Dec 2019 07:09:22 +0000 (10:09 +0300)]
Fixed memory leak
Dmitry Stogov [Tue, 17 Dec 2019 06:58:56 +0000 (09:58 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed memory leaks
Dmitry Stogov [Tue, 17 Dec 2019 06:58:27 +0000 (09:58 +0300)]
Fixed memory leaks
Nikita Popov [Mon, 16 Dec 2019 19:23:53 +0000 (20:23 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Set opcache.optimization_level=0 in test
Nikita Popov [Mon, 16 Dec 2019 19:23:17 +0000 (20:23 +0100)]
Set opcache.optimization_level=0 in test
Otherwise opcache "inlines" the function, which causes a minor
difference in destruction behavior.
Stanislav Malyshev [Mon, 16 Dec 2019 18:59:36 +0000 (10:59 -0800)]
Fix tests
Stanislav Malyshev [Mon, 16 Dec 2019 18:32:49 +0000 (10:32 -0800)]
Fix test
Stanislav Malyshev [Mon, 16 Dec 2019 18:31:40 +0000 (10:31 -0800)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Test fixes
Stanislav Malyshev [Mon, 16 Dec 2019 18:31:22 +0000 (10:31 -0800)]
Test fixes
Stanislav Malyshev [Mon, 16 Dec 2019 18:07:15 +0000 (10:07 -0800)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix test
Fix bug #78793
Fix build - no model field anymore
Fixed bug #78910
Fix #78878: Buffer underflow in bc_shift_addsub
Fix test
Fix #78862: link() silently truncates after a null byte on Windows
Fix #78863: DirectoryIterator class silently truncates after a null byte
Fix #78943: mail() may release string with refcount==1 twice
Stanislav Malyshev [Mon, 16 Dec 2019 18:05:02 +0000 (10:05 -0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix test
Fix bug #78793
Stanislav Malyshev [Mon, 16 Dec 2019 18:04:09 +0000 (10:04 -0800)]
Merge branch 'PHP-7.4' of git.php.net:php-src into PHP-7.4
* 'PHP-7.4' of git.php.net:php-src:
Remove DateTime class registration test
Fixed bug #78973
Fixed bug #78961 (erroneous optimization of re-assigned $GLOBALS)
Stanislav Malyshev [Mon, 16 Dec 2019 18:04:03 +0000 (10:04 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test
Fix bug #78793
Stanislav Malyshev [Mon, 16 Dec 2019 18:03:43 +0000 (10:03 -0800)]
Fix test
Nikita Popov [Mon, 16 Dec 2019 17:57:47 +0000 (18:57 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove DateTime class registration test
Nikita Popov [Mon, 16 Dec 2019 17:57:19 +0000 (18:57 +0100)]
Remove DateTime class registration test
This test is more annoying than useful.
Nikita Popov [Mon, 16 Dec 2019 17:53:32 +0000 (18:53 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78973
Nikita Popov [Mon, 16 Dec 2019 17:52:30 +0000 (18:52 +0100)]
Fixed bug #78973
Save opline in leave helper to correctly handle destructor calls
during CV freeing (or other leave freeing).
Dmitry Stogov [Mon, 16 Dec 2019 09:25:40 +0000 (12:25 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78961 (erroneous optimization of re-assigned $GLOBALS)
Dmitry Stogov [Mon, 16 Dec 2019 09:24:47 +0000 (12:24 +0300)]
Fixed bug #78961 (erroneous optimization of re-assigned $GLOBALS)
Stanislav Malyshev [Mon, 16 Dec 2019 09:14:38 +0000 (01:14 -0800)]
Fix bug #78793
Stanislav Malyshev [Mon, 16 Dec 2019 09:11:01 +0000 (01:11 -0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix build - no model field anymore
Stanislav Malyshev [Mon, 16 Dec 2019 09:10:42 +0000 (01:10 -0800)]
Fix build - no model field anymore
Stanislav Malyshev [Mon, 16 Dec 2019 08:39:37 +0000 (00:39 -0800)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #78910
Fix #78878: Buffer underflow in bc_shift_addsub
Fix test
Fix #78862: link() silently truncates after a null byte on Windows
Fix #78863: DirectoryIterator class silently truncates after a null byte
Fix #78943: mail() may release string with refcount==1 twice
Stanislav Malyshev [Mon, 16 Dec 2019 08:38:54 +0000 (00:38 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #78910
Fix #78878: Buffer underflow in bc_shift_addsub
Fix test
Fix #78862: link() silently truncates after a null byte on Windows
Fix #78863: DirectoryIterator class silently truncates after a null byte
Stanislav Malyshev [Mon, 16 Dec 2019 08:10:39 +0000 (00:10 -0800)]
Fixed bug #78910
Christoph M. Becker [Sat, 30 Nov 2019 11:26:37 +0000 (12:26 +0100)]
Fix #78878: Buffer underflow in bc_shift_addsub
We must not rely on `isdigit()` to detect digits, since we only support
decimal ASCII digits in the following processing.
Stanislav Malyshev [Sat, 30 Nov 2019 23:37:28 +0000 (15:37 -0800)]
Fix test
Christoph M. Becker [Sat, 23 Nov 2019 12:01:33 +0000 (13:01 +0100)]
Fix #78862: link() silently truncates after a null byte on Windows
Since link() is supposed to accepts paths (i.e. strings without NUL
bytes), we must not accept arbitrary strings.
Christoph M. Becker [Mon, 25 Nov 2019 15:56:34 +0000 (16:56 +0100)]
Fix #78863: DirectoryIterator class silently truncates after a null byte
Since the constructor of DirectoryIterator and friends is supposed to
accepts paths (i.e. strings without NUL bytes), we must not accept
arbitrary strings.
Christoph M. Becker [Tue, 10 Dec 2019 17:43:01 +0000 (18:43 +0100)]
Fix #78943: mail() may release string with refcount==1 twice
Since we need `headers_lc` as well as `headers_trim` in the following,
we do not release the former even if they are the same string, to avoid
complicating the release logic even more.
A new test case is not necessary, since we already have
mail_basic_alt2-win32.phpt and others.
Nikita Popov [Sat, 14 Dec 2019 21:42:05 +0000 (22:42 +0100)]
Further reduce parse depth limit in mbstring fuzzer
Depth limit of 1024 still causes optimize_node stack overflows
when running under asan.
George Peter Banyard [Fri, 13 Dec 2019 19:09:42 +0000 (20:09 +0100)]
Remove deprecated behaviour of passing encoding as third parameter in mb_strrpos()
Merged GH-5011
George Peter Banyard [Fri, 13 Dec 2019 17:43:14 +0000 (18:43 +0100)]
Revert "Remove dead code in libmbfl, memory device"
Stop trusting CLion's automatic dead code detection because it seems to be wrong
more often than not.
This reverts commit
612c86db3ea139e4ed4aa6a9aa28da343c9b39b8 .
George Peter Banyard [Fri, 13 Dec 2019 16:59:52 +0000 (17:59 +0100)]
Remove dead code in sanitizing_filter.c of the filter extension
George Peter Banyard [Fri, 13 Dec 2019 16:58:37 +0000 (17:58 +0100)]
Remove dead code in libmbfl, memory device
Nikita Popov [Fri, 13 Dec 2019 15:38:42 +0000 (16:38 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78921
Nikita Popov [Fri, 13 Dec 2019 15:38:24 +0000 (16:38 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #78921
Nikita Popov [Fri, 13 Dec 2019 15:37:20 +0000 (16:37 +0100)]
Fixed bug #78921
By resetting fake_scope during autoloading. We already do the same
when executing destructors.
Nikita Popov [Fri, 13 Dec 2019 15:09:28 +0000 (16:09 +0100)]
Limit parse depth in mbstring fuzzer
The default depth of 4096 is large enough to cause optimize_node
stack overflows under asan. Reduce to 1024.
Nikita Popov [Fri, 13 Dec 2019 10:05:41 +0000 (11:05 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Introduce extra counter to avoid RTD key collisions
Nikita Popov [Wed, 11 Dec 2019 16:11:30 +0000 (17:11 +0100)]
Introduce extra counter to avoid RTD key collisions
Also generate a fatal error if a collision occurs in zend_compile.
This is not perfect, because collisions might still be introduced
via opcache, if one file is included multiple times during a request,
invalidate in the meantime and recompiled by different processes.
This still needs to be addressed, but this patch fixes the much
more common case of collisions occuring when opcache is not used.
Fixes bug #78903.
Dylan T [Thu, 12 Dec 2019 11:13:35 +0000 (11:13 +0000)]
phar: fix offset*() prototypes
Máté Kocsis [Thu, 12 Dec 2019 22:01:07 +0000 (23:01 +0100)]
Fix exception message of implode()
Christoph M. Becker [Thu, 12 Dec 2019 13:22:32 +0000 (14:22 +0100)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78929: plus signs in cookie values are converted to spaces