]>
granicus.if.org Git - php/log
Stanislav Malyshev [Mon, 29 Jul 2019 21:51:35 +0000 (14:51 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78338: Array cross-border reading in PCRE
Stanislav Malyshev [Mon, 29 Jul 2019 21:51:21 +0000 (14:51 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78338: Array cross-border reading in PCRE
Christoph M. Becker [Mon, 29 Jul 2019 17:31:47 +0000 (19:31 +0200)]
Fix #78338: Array cross-border reading in PCRE
We backport r1092 from pcre2.
Stanislav Malyshev [Mon, 29 Jul 2019 20:20:59 +0000 (13:20 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #77919: Potential UAF in Phar RSHUTDOWN
Update NEWS
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
Stanislav Malyshev [Mon, 29 Jul 2019 20:20:52 +0000 (13:20 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77919: Potential UAF in Phar RSHUTDOWN
Update NEWS
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
Stanislav Malyshev [Mon, 29 Jul 2019 20:20:44 +0000 (13:20 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77919: Potential UAF in Phar RSHUTDOWN
Update NEWS
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
Stanislav Malyshev [Mon, 29 Jul 2019 20:19:16 +0000 (13:19 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #77919: Potential UAF in Phar RSHUTDOWN
Update NEWS
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
Christoph M. Becker [Mon, 29 Jul 2019 14:08:03 +0000 (16:08 +0200)]
Fix #77919: Potential UAF in Phar RSHUTDOWN
We have to properly clean up in case phar_flush() is failing.
We also make the expectation of the respective test case less liberal
to avoid missing such bugs in the future.
Stanislav Malyshev [Mon, 29 Jul 2019 07:55:18 +0000 (00:55 -0700)]
Update NEWS
Nikita Popov [Mon, 29 Jul 2019 19:08:39 +0000 (21:08 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Jul 2019 18:01:20 +0000 (20:01 +0200)]
Don't explicitly install homebrew
It is already installed on azure, and this installation step is
very unreliable lately.
Christoph M. Becker [Mon, 29 Jul 2019 16:50:13 +0000 (18:50 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix build for --disable-signals
Christoph M. Becker [Mon, 29 Jul 2019 16:46:05 +0000 (18:46 +0200)]
Fix build for --disable-signals
Nikita Popov [Mon, 29 Jul 2019 15:34:42 +0000 (17:34 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Jul 2019 15:34:21 +0000 (17:34 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 29 Jul 2019 15:34:08 +0000 (17:34 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Albert Casademont [Tue, 23 Jul 2019 12:03:06 +0000 (14:03 +0200)]
Fix bug #78326
Similar to what fread() does, truncate the stream_get_contents()
result if the original buffer was way too large.
Nikita Popov [Mon, 29 Jul 2019 15:15:35 +0000 (17:15 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Jul 2019 14:58:29 +0000 (16:58 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 29 Jul 2019 14:57:57 +0000 (16:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 23 Jul 2019 08:38:23 +0000 (10:38 +0200)]
Fix Zend signals unblocking
There are a few parts here:
* opcache should not be blocking signals while invoking compile_file,
otherwise signals may remain blocked on a compile error. While at
it, also protect SHM memory during compile_file.
* We should deactivate Zend signals at the end of the request, to make
sure that we gracefully recover from a missing unblock and signals
don't remain blocked forever.
* We don't use a critical section in deactivation, because it should
not be necessary. Additionally we want to clean up the signal queue,
if it is non-empty.
* Enable SIGG(check) in debug builds so we notice issues in the future.
Christoph M. Becker [Mon, 29 Jul 2019 12:49:18 +0000 (14:49 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS [ci skip]
Christoph M. Becker [Mon, 29 Jul 2019 12:48:57 +0000 (14:48 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS [ci skip]
Christoph M. Becker [Mon, 29 Jul 2019 12:48:23 +0000 (14:48 +0200)]
Update NEWS [ci skip]
The fix has been cherry-picked into PHP-7.3.8, so the bug will be fixed
already there.
Christoph M. Becker [Mon, 29 Jul 2019 11:39:28 +0000 (13:39 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Document how to generate ffi_parser.c
Christoph M. Becker [Thu, 25 Jul 2019 15:05:43 +0000 (17:05 +0200)]
Document how to generate ffi_parser.c
Nikita Popov [Mon, 29 Jul 2019 11:03:59 +0000 (13:03 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Jul 2019 11:03:28 +0000 (13:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 29 Jul 2019 11:02:01 +0000 (13:02 +0200)]
Fixed bug #78341
The smart branch logic assumed b->start refers to the old offsets,
while b->start was already adjusted to the new offsets at this
point. Delay the change until later.
Nikita Popov [Mon, 29 Jul 2019 09:27:44 +0000 (11:27 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Jul 2019 09:27:39 +0000 (11:27 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 29 Jul 2019 09:27:34 +0000 (11:27 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 29 Jul 2019 09:23:26 +0000 (11:23 +0200)]
Fixed bug #78333
Don't dereference float/double values at unknown address, instead
memcpy it into an aligned stack slot and dereference that.
Nikita Popov [Mon, 29 Jul 2019 09:26:36 +0000 (11:26 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Jul 2019 09:26:15 +0000 (11:26 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 29 Jul 2019 09:26:00 +0000 (11:26 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 29 Jul 2019 09:23:26 +0000 (11:23 +0200)]
Fixed bug #78333
Don't dereference float/double values at unknown address, instead
memcpy it into an aligned stack slot and dereference that.
Nikita Popov [Mon, 29 Jul 2019 09:13:33 +0000 (11:13 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Jul 2019 09:12:00 +0000 (11:12 +0200)]
Fixed bug #78344
When performing a constant visibility check during compilation we
might be dealing with unlinked classes and as such should account
for the possibility of unresolved parents.
Nikita Popov [Mon, 29 Jul 2019 08:12:58 +0000 (10:12 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Jul 2019 08:07:12 +0000 (10:07 +0200)]
Fixed bug #78340
Even if we know the file size, we still need to read in a loop in
case the read call returns an incomplete result.
This was less of an issue previously because we did not use the
"one large read" approach for non-plain stream wrappers.
Stanislav Malyshev [Mon, 8 Jul 2019 00:39:59 +0000 (17:39 -0700)]
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
Stanislav Malyshev [Mon, 8 Jul 2019 00:01:01 +0000 (17:01 -0700)]
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
Christoph M. Becker [Mon, 29 Jul 2019 06:52:11 +0000 (08:52 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78342: Bus error in configure test for iconv //IGNORE
Christoph M. Becker [Mon, 29 Jul 2019 06:51:14 +0000 (08:51 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78342: Bus error in configure test for iconv //IGNORE
Christoph M. Becker [Mon, 29 Jul 2019 06:50:17 +0000 (08:50 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78342: Bus error in configure test for iconv //IGNORE
Christoph M. Becker [Mon, 29 Jul 2019 06:48:13 +0000 (08:48 +0200)]
Fix #78342: Bus error in configure test for iconv //IGNORE
We have to check the return value of iconv_open() for error, to avoid
that and potentially other undesired behavior of iconv().
Peter Kokot [Sat, 27 Jul 2019 21:14:43 +0000 (23:14 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
nit: Fix a typo in UPGRADING
Tyson Andre [Sat, 27 Jul 2019 18:35:42 +0000 (14:35 -0400)]
nit: Fix a typo in UPGRADING
Closes GH-4481
Christoph M. Becker [Sat, 27 Jul 2019 08:14:14 +0000 (10:14 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
file encoding cleanup: remove bom in win32 files
Sebastian Jennen [Sat, 27 Jul 2019 07:47:32 +0000 (09:47 +0200)]
file encoding cleanup: remove bom in win32 files
These two files have been: "UTF-8 Unicode (with BOM) text".
By applying `dos2unix` on these files the BOM has been removed.
I checked the whole source code with dos2unix:
These were the only two text files affected.
Peter Kokot [Thu, 25 Jul 2019 23:48:22 +0000 (01:48 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Mention also API versions bumps
Peter Kokot [Tue, 23 Jul 2019 23:01:11 +0000 (01:01 +0200)]
Mention also API versions bumps
Closes GH-4470
Peter Kokot [Thu, 25 Jul 2019 23:17:13 +0000 (01:17 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix typos in UPGRADING and improve wording in a few places
Theodore Brown [Thu, 25 Jul 2019 17:23:26 +0000 (12:23 -0500)]
Fix typos in UPGRADING and improve wording in a few places
Closes GH-4478
Christoph M. Becker [Thu, 25 Jul 2019 17:09:53 +0000 (19:09 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove duplication
Christoph M. Becker [Thu, 25 Jul 2019 17:09:21 +0000 (19:09 +0200)]
Remove duplication
Levi Morrison [Thu, 25 Jul 2019 15:51:29 +0000 (09:51 -0600)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove .post files only for passing tests
Levi Morrison [Thu, 25 Jul 2019 15:50:47 +0000 (09:50 -0600)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Remove .post files only for passing tests
Levi Morrison [Thu, 25 Jul 2019 15:49:18 +0000 (09:49 -0600)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Remove .post files only for passing tests
Levi Morrison [Thu, 25 Jul 2019 15:48:29 +0000 (09:48 -0600)]
Remove .post files only for passing tests
This allows the sh script for failing tests with --POST-- to work
Matteo Beccati [Thu, 25 Jul 2019 14:31:00 +0000 (16:31 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Addded missing NEWS/UPGRADING entries for PDO "??" escape
Matteo Beccati [Thu, 25 Jul 2019 14:28:42 +0000 (16:28 +0200)]
Addded missing NEWS/UPGRADING entries for PDO "??" escape
Remi Collet [Thu, 25 Jul 2019 09:50:57 +0000 (11:50 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix build warnings
Remi Collet [Wed, 24 Jul 2019 14:06:07 +0000 (16:06 +0200)]
Fix build warnings
- switch from strncpy to memcpy for -Wstringop-truncation
Nikita Popov [Thu, 25 Jul 2019 08:43:50 +0000 (10:43 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 23 Jul 2019 09:57:02 +0000 (11:57 +0200)]
Throw notice for plain wrapper fread/fwrite errors
Similar to what is done for socket read/write errors.
Peter Kokot [Wed, 24 Jul 2019 20:19:49 +0000 (22:19 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Bump PHP_JSON_VERSION to PHP_VERSION
Peter Kokot [Mon, 22 Jul 2019 21:25:44 +0000 (23:25 +0200)]
Bump PHP_JSON_VERSION to PHP_VERSION
Closes GH-4459
Peter Kokot [Wed, 24 Jul 2019 20:04:24 +0000 (22:04 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove AC_FPM_POLL
Peter Kokot [Sun, 21 Jul 2019 07:58:44 +0000 (09:58 +0200)]
Remove AC_FPM_POLL
AC_FPM_POLL defines HAVE_POLL symbol which is already checked by
configure.ac and function poll in AC_CHECK_FUNCTIONS.
Closes GH-4449
Peter Kokot [Wed, 24 Jul 2019 19:43:26 +0000 (21:43 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove outdated Libtool hack for macs
Peter Kokot [Wed, 24 Jul 2019 19:40:21 +0000 (21:40 +0200)]
Remove outdated Libtool hack for macs
This was once relevant for older versions of macs and autoconf 2.13.
Closes GH-4435
Nikita Popov [Wed, 24 Jul 2019 18:53:19 +0000 (20:53 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 24 Jul 2019 18:51:19 +0000 (20:51 +0200)]
Mark _get_zval_ptr_deref as unused
Dmitry Stogov [Wed, 24 Jul 2019 17:00:55 +0000 (20:00 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Avoid over-specialization
Dmitry Stogov [Wed, 24 Jul 2019 16:51:56 +0000 (19:51 +0300)]
Avoid over-specialization
Dmitry Stogov [Wed, 24 Jul 2019 15:52:55 +0000 (18:52 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Reordering
Dmitry Stogov [Wed, 24 Jul 2019 15:49:46 +0000 (18:49 +0300)]
Reordering
Dmitry Stogov [Wed, 24 Jul 2019 15:40:03 +0000 (18:40 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Delay dereference
Dmitry Stogov [Wed, 24 Jul 2019 15:36:50 +0000 (18:36 +0300)]
Delay dereference
Nikita Popov [Wed, 24 Jul 2019 14:41:44 +0000 (16:41 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 24 Jul 2019 14:40:18 +0000 (16:40 +0200)]
Remove php_openssl_cipher_get_version()
This was added in 7.1 when add_assoc_string mistakenly accepted
a char* rather than const char* parameter and is no longer needed.
We can use SSL_CIPHER_get_version() directly.
Dmitry Stogov [Wed, 24 Jul 2019 14:38:42 +0000 (17:38 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Avoid reloading
Dmitry Stogov [Wed, 24 Jul 2019 14:30:38 +0000 (17:30 +0300)]
Avoid reloading
Dmitry Stogov [Wed, 24 Jul 2019 11:13:40 +0000 (14:13 +0300)]
Simplify TMP/VAR operand releasing
Nikita Popov [Wed, 24 Jul 2019 10:07:04 +0000 (12:07 +0200)]
Merge branch 'PHP-7.4'
David Carlier [Sun, 21 Jul 2019 13:48:46 +0000 (14:48 +0100)]
Fix bindpath mem leak in cgi
Closes GH-4451.
Derick Rethans [Wed, 24 Jul 2019 09:39:54 +0000 (09:39 +0000)]
Update NEWS for 7.4.0beta2
Derick Rethans [Wed, 24 Jul 2019 09:38:35 +0000 (09:38 +0000)]
Update NEWS for PHP 7.4.0beta1
Nikita Popov [Wed, 24 Jul 2019 08:52:18 +0000 (10:52 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 23 Jul 2019 10:41:24 +0000 (12:41 +0200)]
Don't skip uninitialized typed props in get_class_vars()
For bug #78319.
Nikita Popov [Wed, 24 Jul 2019 08:44:40 +0000 (10:44 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 24 Jul 2019 08:42:19 +0000 (10:42 +0200)]
Revert "Drop free_filename field from zend_file_handle"
This reverts commit
e0eca262852dba1a78afcde64a49126c81fead1a .
free_filename is used by the wincache extension, restore this
field for PHP 7.4.
Nikita Popov [Wed, 24 Jul 2019 08:07:51 +0000 (10:07 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 24 Jul 2019 08:05:44 +0000 (10:05 +0200)]
Avoid references in TMP var
Make sure we deref the OBJ_IS result, because we store it in a TMP
var, which is not allowed to contain references and will cause
assertion failures in the unspecialized VM.
This also partially reverts
fd463a9a6078074f8f648982b42bdd14423fb614 ,
which merged the TMP and VAR specializations of COALESCE to work
around this bug.
An alternative would be to change the result type of OBJ_IS back
to VAR.
Nikita Popov [Wed, 24 Jul 2019 07:55:09 +0000 (09:55 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 24 Jul 2019 07:44:55 +0000 (09:44 +0200)]
Try to fix macos build
By avoiding unused variable opline warnings. Also clean up the
replacement of ZEND_VM_SPEC -- we were sometimes treating it as
an always-defined constant with a value (what it actually is) and
sometimes as a conditionally defined constant (which it isn't, but
which still worked thanks to the specializer). Switch to only
treating it as a constant with a value.
Dmitry Stogov [Tue, 23 Jul 2019 22:52:26 +0000 (01:52 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed CALL VM
Dmitry Stogov [Tue, 23 Jul 2019 22:52:05 +0000 (01:52 +0300)]
Fixed CALL VM