]>
granicus.if.org Git - php/log
Fabien Villepinte [Mon, 16 Sep 2019 08:43:39 +0000 (10:43 +0200)]
Make some session tests more robust
Nikita Popov [Mon, 16 Sep 2019 13:01:22 +0000 (15:01 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 16 Sep 2019 13:01:14 +0000 (15:01 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 16 Sep 2019 13:01:05 +0000 (15:01 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 16 Sep 2019 13:00:20 +0000 (15:00 +0200)]
Fixed bug #78545
By using an explicit (double) cast.
Christoph M. Becker [Mon, 16 Sep 2019 12:59:22 +0000 (14:59 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78516: password_hash(): Memory cost is not in allowed range
Christoph M. Becker [Sat, 14 Sep 2019 10:04:01 +0000 (12:04 +0200)]
Fix #78516: password_hash(): Memory cost is not in allowed range
libsodium measures the memory cost in bytes, while password_hash() and
friends expect kibibyte values. We have to properly map between these
scales not only when calling libsodium functions, but also when
checking for allowed values.
We also refactor to rid the code duplication.
Nikita Popov [Mon, 16 Sep 2019 12:38:19 +0000 (14:38 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 16 Sep 2019 12:37:16 +0000 (14:37 +0200)]
Fix use-after-free due to packed->mixed conversion with __unserialize()
Nikita Popov [Mon, 16 Sep 2019 11:53:44 +0000 (13:53 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 16 Sep 2019 11:52:52 +0000 (13:52 +0200)]
Fix segfault when unserializing abstract class
Nikita Popov [Mon, 16 Sep 2019 11:03:18 +0000 (13:03 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 16 Sep 2019 11:03:08 +0000 (13:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 16 Sep 2019 11:02:56 +0000 (13:02 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 16 Sep 2019 11:01:59 +0000 (13:01 +0200)]
Fix leak in SplObjectStorage unserialization
The result of php_var_unserialize always needs to be destroyed,
even if the call failed.
Nikita Popov [Mon, 16 Sep 2019 10:00:26 +0000 (12:00 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 16 Sep 2019 09:59:43 +0000 (11:59 +0200)]
Fix test after unserialize change
Nikita Popov [Mon, 16 Sep 2019 09:40:13 +0000 (11:40 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 16 Sep 2019 09:38:35 +0000 (11:38 +0200)]
Sanity-check array/object lengths during unserialization
Avoid OOM conditions in unserialize due to overly large array or
object length specifications.
Dmitry Stogov [Mon, 16 Sep 2019 07:30:02 +0000 (10:30 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed typos
Dmitry Stogov [Mon, 16 Sep 2019 07:29:29 +0000 (10:29 +0300)]
Fixed typos
Thomas Gerbet [Sun, 15 Sep 2019 18:28:40 +0000 (20:28 +0200)]
Add stubs for ext-hash
Christoph M. Becker [Sun, 15 Sep 2019 19:27:45 +0000 (21:27 +0200)]
Add missing ZPP_none()
Christoph M. Becker [Sun, 15 Sep 2019 13:14:46 +0000 (15:14 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Stick with zend_long for ABI compatibility
Christoph M. Becker [Sun, 15 Sep 2019 13:14:02 +0000 (15:14 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Stick with zend_long for ABI compatibility
Christoph M. Becker [Sun, 15 Sep 2019 13:13:13 +0000 (15:13 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Stick with zend_long for ABI compatibility
Christoph M. Becker [Sun, 15 Sep 2019 13:11:25 +0000 (15:11 +0200)]
Stick with zend_long for ABI compatibility
Cf. <https://github.com/php/php-src/pull/4700#issuecomment-
531515689 >.
Christoph M. Becker [Sat, 14 Sep 2019 16:49:00 +0000 (18:49 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78535: auto_detect_line_endings value not parsed as bool
Christoph M. Becker [Sat, 14 Sep 2019 16:47:53 +0000 (18:47 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78535: auto_detect_line_endings value not parsed as bool
Christoph M. Becker [Sat, 14 Sep 2019 16:46:34 +0000 (18:46 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78535: auto_detect_line_endings value not parsed as bool
bugreportuser [Thu, 12 Sep 2019 18:44:08 +0000 (12:44 -0600)]
Fix #78535: auto_detect_line_endings value not parsed as bool
Nikita Popov [Sat, 14 Sep 2019 10:10:15 +0000 (12:10 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Sat, 14 Sep 2019 10:08:20 +0000 (12:08 +0200)]
Fix double-free on invalid large octal with separators
To clean up the mess here a bit, check for invalid octal digits
with an explicit loop instead of mixing this into the string to
number conversion.
Also clean up some type usage.
Nikita Popov [Fri, 13 Sep 2019 22:25:39 +0000 (00:25 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 13 Sep 2019 22:00:04 +0000 (00:00 +0200)]
Use XtOffsetOf() in url_scanner_ex
Instead of a manual implementation.
Nikita Popov [Fri, 13 Sep 2019 21:49:50 +0000 (23:49 +0200)]
Fix symtable_cache_limit assignment in phpdbg
The meaning of the limit changed in 7.4, it now points one past the
end. Adjust code accordingly.
David Carlier [Fri, 13 Sep 2019 10:37:53 +0000 (11:37 +0100)]
Fix tautological compare warning
The ZEND_ALLOCATOR() macro compares against constants that are
larger than the unsigned short type, resulting in warnings on
clang. Avoid this by explicitly casting to size_t.
Nikita Popov [Fri, 13 Sep 2019 20:04:58 +0000 (22:04 +0200)]
Define OBJ_PROP_TO_OFFSET() using XtOffsetOf()
This avoids null pointer arithmetic UB.
Nikita Popov [Fri, 13 Sep 2019 19:52:17 +0000 (21:52 +0200)]
Include stddef.h in zend_portability.h for offsetof() macro
This makes sure that we use compiler builtins when they are
available and thus avoid ubsan warnings in clang.
And also reindent the fallback implementation.
Nikita Popov [Fri, 13 Sep 2019 16:23:47 +0000 (18:23 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 13 Sep 2019 15:09:24 +0000 (17:09 +0200)]
Fix use-after-free in assign-ref compilation
zend_emit_op_data may reallocate the op_array, so the assignment
of the RETURNS_FUNCTION flag may happen on an outdated opline.
Restructure the code a bit to set the flag before calling
zend_emit_op_data().
Nikita Popov [Fri, 13 Sep 2019 12:37:28 +0000 (14:37 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 13 Sep 2019 12:37:15 +0000 (14:37 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 12 Sep 2019 11:17:27 +0000 (13:17 +0200)]
Fix bug #78525
When calling free_result_buffers(), also free field metadata and
restore the mempool state to what it was before any allocations
have been made. Remove the mempool save/restore logic for the
inner result set as this is now handled on a higher level.
Dmitry Stogov [Fri, 13 Sep 2019 09:39:45 +0000 (12:39 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Make constant and copy propagation only for IS_TMP_VAR operands
Dmitry Stogov [Fri, 13 Sep 2019 09:38:57 +0000 (12:38 +0300)]
Make constant and copy propagation only for IS_TMP_VAR operands
Dmitry Stogov [Fri, 13 Sep 2019 09:13:25 +0000 (12:13 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed incorrect usage of QM_ASSIGN instruction
Dmitry Stogov [Fri, 13 Sep 2019 09:08:59 +0000 (12:08 +0300)]
Fixed incorrect usage of QM_ASSIGN instruction
Dmitry Stogov [Thu, 12 Sep 2019 22:43:40 +0000 (01:43 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78531 (Crash when using undefined variable as object
Dmitry Stogov [Thu, 12 Sep 2019 22:42:02 +0000 (01:42 +0300)]
Fixed bug #78531 (Crash when using undefined variable as object
Dmitry Stogov [Thu, 12 Sep 2019 21:20:06 +0000 (00:20 +0300)]
Use zval_try_get_tmp_string() instead of zval_get_tmp_string() for cheaper EG(exception) check
Dmitry Stogov [Thu, 12 Sep 2019 17:13:31 +0000 (20:13 +0300)]
Avoid reloading
Dmitry Stogov [Thu, 12 Sep 2019 16:43:45 +0000 (19:43 +0300)]
Reorder conditions
Dmitry Stogov [Thu, 12 Sep 2019 15:53:26 +0000 (18:53 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Load string once
Dmitry Stogov [Thu, 12 Sep 2019 15:46:13 +0000 (18:46 +0300)]
Load string once
Dmitry Stogov [Thu, 12 Sep 2019 15:29:58 +0000 (18:29 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Eliminate checks using ZEND_CONST_COND() macro
Dmitry Stogov [Thu, 12 Sep 2019 15:29:19 +0000 (18:29 +0300)]
Eliminate checks using ZEND_CONST_COND() macro
Nikita Popov [Thu, 12 Sep 2019 14:41:45 +0000 (16:41 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 11 Sep 2019 13:31:04 +0000 (15:31 +0200)]
Allow throwing exception while loading parent class
This is a fix for symfony/symfony#32995.
The behavior is:
* Throwing exception when loading parent/interface is allowed
(and we will also throw one if the class is simply not found).
* If this happens, the bucket key for the class is reset, so
it's possibly to try registering the same class again.
* However, if the class has already been used due to a variance
obligation, the exception is upgraded to a fatal error, as we
cannot safely unregister the class stub anymore.
Christoph M. Becker [Thu, 12 Sep 2019 07:14:27 +0000 (09:14 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix exif build
NEWS
Christoph M. Becker [Thu, 12 Sep 2019 07:14:08 +0000 (09:14 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix exif build
NEWS
Christoph M. Becker [Thu, 12 Sep 2019 07:11:14 +0000 (09:11 +0200)]
Fix exif build
As of PHP 7.3.0 the `model` field is removed.
Kalle Sommer Nielsen [Thu, 12 Sep 2019 03:52:24 +0000 (06:52 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
NEWS
Kalle Sommer Nielsen [Thu, 12 Sep 2019 03:50:53 +0000 (06:50 +0300)]
NEWS
Kalle Sommer Nielsen [Thu, 12 Sep 2019 03:34:35 +0000 (06:34 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
Kalle Sommer Nielsen [Thu, 12 Sep 2019 03:33:40 +0000 (06:33 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
Kalle Sommer Nielsen [Thu, 12 Sep 2019 03:31:52 +0000 (06:31 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
Kalle Sommer Nielsen [Thu, 12 Sep 2019 03:21:39 +0000 (06:21 +0300)]
Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
Nikita Popov [Wed, 11 Sep 2019 15:05:07 +0000 (17:05 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 11 Sep 2019 15:04:13 +0000 (17:04 +0200)]
Improve "already declared" error message
If this error is missing because the rtd_key was renamed to lcname,
fetch the class based on lcname and use the class type and cased
name from there.
Nikita Popov [Wed, 11 Sep 2019 14:51:30 +0000 (16:51 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 11 Sep 2019 14:50:16 +0000 (16:50 +0200)]
Fix typo in unlinked_instanceof assertion
Nikita Popov [Wed, 11 Sep 2019 14:30:59 +0000 (16:30 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 11 Sep 2019 14:27:28 +0000 (16:27 +0200)]
Only allow "nearly linked" classes for parent/interface
The requirements for parent/interface are difference than for the
variance checks in type declarations. The latter can work on fully
unlinked classes, but the former need inheritance to be essentially
finished, only variance checks may still be outstanding.
Adding a new flag for this because we have lots of space, but we
could also represent these "inheritance states" more compactly in
the future.
Nikita Popov [Wed, 11 Sep 2019 10:02:39 +0000 (12:02 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 3 Sep 2019 08:06:09 +0000 (10:06 +0200)]
Specify -fsanitize-no-recover
To make it more obvious when there are ubsan failures.
Nicolas Grekas [Tue, 3 Sep 2019 08:02:30 +0000 (10:02 +0200)]
Improve Symfony test setup
Perform PHPUnit installation under php7.3 -- which will also make
it work on master.
Also properly resolve the tty issue by specifying excluded groups
during the test run.
Nikita Popov [Wed, 11 Sep 2019 09:13:33 +0000 (11:13 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 11 Sep 2019 08:59:04 +0000 (10:59 +0200)]
Free history_get_history_state() result
It's not documented, but per https://bugs.python.org/issue8065
the result is freshly malloc'd and needs to be freed.
Nikita Popov [Wed, 11 Sep 2019 08:32:27 +0000 (10:32 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 11 Sep 2019 08:31:03 +0000 (10:31 +0200)]
Fix another pointer indexing UB in http_fopen_wrapper
Only compute the gep after checking whether the pointer is NULL.
Nikita Popov [Wed, 11 Sep 2019 08:27:32 +0000 (10:27 +0200)]
Fixed bug #78506
Nikita Popov [Wed, 11 Sep 2019 07:53:18 +0000 (09:53 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 11 Sep 2019 07:52:31 +0000 (09:52 +0200)]
Preloading: Fix handling of static vars in inherited methods
Part of bug #78512.
Dmitry Stogov [Tue, 10 Sep 2019 21:53:30 +0000 (00:53 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bad format string
Dmitry Stogov [Tue, 10 Sep 2019 21:52:54 +0000 (00:52 +0300)]
Fixed bad format string
Sara Golemon [Tue, 10 Sep 2019 17:05:56 +0000 (13:05 -0400)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Bump for 7.2.24
Sara Golemon [Tue, 10 Sep 2019 17:05:38 +0000 (13:05 -0400)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Bump for 7.2.24
Sara Golemon [Tue, 10 Sep 2019 17:05:17 +0000 (13:05 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Bump for 7.2.24
Sara Golemon [Tue, 10 Sep 2019 17:03:27 +0000 (13:03 -0400)]
Bump for 7.2.24
Remi Collet [Tue, 10 Sep 2019 14:30:39 +0000 (16:30 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Raise minimal GCC version, Test with 4.8 is OK With 4.4: error: #pragma GCC diagnostic not allowed inside functions
Remi Collet [Tue, 10 Sep 2019 14:29:44 +0000 (16:29 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Raise minimal GCC version, Test with 4.8 is OK With 4.4: error: #pragma GCC diagnostic not allowed inside functions
Remi Collet [Tue, 10 Sep 2019 14:29:30 +0000 (16:29 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Raise minimal GCC version, Test with 4.8 is OK With 4.4: error: #pragma GCC diagnostic not allowed inside functions
Remi Collet [Tue, 10 Sep 2019 14:28:35 +0000 (16:28 +0200)]
Raise minimal GCC version,
Test with 4.8 is OK
With 4.4: error: #pragma GCC diagnostic not allowed inside functions
Christoph M. Becker [Tue, 10 Sep 2019 13:13:52 +0000 (15:13 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
PHP 7.3.10RC1 has been tagged
Christoph M. Becker [Tue, 10 Sep 2019 13:13:11 +0000 (15:13 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
PHP 7.3.10RC1 has been tagged
Christoph M. Becker [Tue, 10 Sep 2019 13:11:54 +0000 (15:11 +0200)]
PHP 7.3.10RC1 has been tagged
Peter Cowburn [Tue, 10 Sep 2019 12:18:53 +0000 (13:18 +0100)]
upgrading notes for ValueError/zend_value_error()
Dmitry Stogov [Tue, 10 Sep 2019 12:12:42 +0000 (15:12 +0300)]
ceanup
Christoph M. Becker [Tue, 10 Sep 2019 10:36:57 +0000 (12:36 +0200)]
Prefer ValueError over Error in GD
Cf. <https://github.com/php/php-src/pull/4682>.