]>
granicus.if.org Git - php/log
Peter Kokot [Tue, 25 Jun 2019 19:23:07 +0000 (21:23 +0200)]
Fix concurrent testing of bug 61964
When tests are run concurrently using the -j option there might be a
change of failure and writing to the same directory from both tests.
Use test filenames for generated temp dirs
Peter Kokot [Tue, 25 Jun 2019 18:21:16 +0000 (20:21 +0200)]
Fix posix_errno test without PCNTL dep
When PCNTL extension is not enabled, the SIGKILL constant is also not
available.
Peter Kokot [Wed, 26 Jun 2019 00:36:44 +0000 (02:36 +0200)]
Remove unused HAVE_DATE and HAVE_SPL symbols
These two are never defined anymore since PHP 7.4 and can be
considered to have always available date and hash extensions.
Peter Kokot [Sun, 23 Jun 2019 13:41:43 +0000 (15:41 +0200)]
Remove HAVE_STRTOD and strtod check
There is no need to check for the strtod function. It is part of C89
standard which PHP-7.4+ supports.
http://port70.net/~nsz/c/c89/c89-draft.html#4.10.1.4
Peter Kokot [Sun, 23 Jun 2019 13:43:25 +0000 (15:43 +0200)]
Set Computer English language for credits sorting
This makes the script a bit more portable when used on systems with
different LC_ALL and LANG settings.
Christoph M. Becker [Wed, 26 Jun 2019 15:02:08 +0000 (17:02 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Remove stream_socket_sendto.phpt
Christoph M. Becker [Wed, 26 Jun 2019 15:01:29 +0000 (17:01 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Remove stream_socket_sendto.phpt
Nikita Popov [Wed, 26 Jun 2019 14:58:37 +0000 (16:58 +0200)]
Remove stream_socket_sendto.phpt
Fails for me locally due to different number of warnings with
different messages. Rather than adding more wildcards I'm dropping
this test entirely, as it doesn't seem to test anything particularly
useful.
(cherry picked from commit
84333cad674890174c47f3c21b1b1cf85a4276ac )
Dmitry Stogov [Wed, 26 Jun 2019 10:27:13 +0000 (13:27 +0300)]
Private methods don't have to be duplicated
Nikita Popov [Tue, 25 Jun 2019 14:57:09 +0000 (16:57 +0200)]
Fix xml doc leak in soap
Nikita Popov [Tue, 25 Jun 2019 13:49:28 +0000 (15:49 +0200)]
Use ldap_destroy instead of ldap_unbind_ext
Nikita Popov [Tue, 25 Jun 2019 13:01:58 +0000 (15:01 +0200)]
Fix fpm limit_extensions leak
The logic here is somewhat ugly because the worker pool structure
gets freed early, so we need to explicitly transfer ownership.
Dmitry Stogov [Tue, 25 Jun 2019 22:00:31 +0000 (01:00 +0300)]
Reorder conditions to minimize number of checks on fast path
Dmitry Stogov [Tue, 25 Jun 2019 21:32:22 +0000 (00:32 +0300)]
Remove always true/false conditions, remove dead conde and simplify code.
Dmitry Stogov [Tue, 25 Jun 2019 15:26:56 +0000 (18:26 +0300)]
Replace previosly checked conditions by ZEND_ASSERT()
Dmitry Stogov [Tue, 25 Jun 2019 14:43:46 +0000 (17:43 +0300)]
Fixed variance check for abstract constructor during erlay binding
Dmitry Stogov [Tue, 25 Jun 2019 13:37:42 +0000 (16:37 +0300)]
Cleanup
Nikita Popov [Tue, 25 Jun 2019 09:32:18 +0000 (11:32 +0200)]
FFI: Perform bitfield operations byte-wise
Otherwise we may perform reads/writes outside the allocation, as
already happens in 032.phpt.
Nikita Popov [Tue, 25 Jun 2019 11:08:28 +0000 (13:08 +0200)]
Fix out of bounds write in phpdbg
It seems that this code has a peculiar interpretation of "len",
where it actually points to the last character, not one past it.
So we need +1 here for that extra char and another +1 for the
terminating null byte.
Nikita Popov [Tue, 25 Jun 2019 11:17:39 +0000 (13:17 +0200)]
Fix CURLINFO_COOKIELIST leak
Nikita Popov [Tue, 25 Jun 2019 10:46:58 +0000 (12:46 +0200)]
Fix leak on sqlite3 open error
sqlite3_open creates the database object even if the operation
fails.
Nikita Popov [Tue, 25 Jun 2019 10:09:47 +0000 (12:09 +0200)]
Fix SSL_CTX leak in ftp extension
SSL_CTX is a refcounted structure, which will be held by the SSL
handle, so we can free it here.
Nikita Popov [Tue, 25 Jun 2019 10:02:01 +0000 (12:02 +0200)]
Fix UConverter leak
Nikita Popov [Tue, 25 Jun 2019 09:51:40 +0000 (11:51 +0200)]
Fix TimeZone leak in intl MessageFormat
I'm just giving each format a distinct owned object here ... sharing
it looks complicated.
Nikita Popov [Mon, 24 Jun 2019 15:35:22 +0000 (17:35 +0200)]
Fix stream leak in phar cache_list
Nikita Popov [Fri, 21 Jun 2019 15:08:24 +0000 (17:08 +0200)]
run-tests: Don't die unnecessarily
die/exit leak memory, don't use them if we don't need to.
Dmitry Stogov [Tue, 25 Jun 2019 12:05:27 +0000 (15:05 +0300)]
Set ZEND_ACC_LINKED flag after early binding (for consistency)
Dmitry Stogov [Tue, 25 Jun 2019 11:20:41 +0000 (14:20 +0300)]
Reduce overhead of delayed early binding
Christoph M. Becker [Tue, 25 Jun 2019 11:05:53 +0000 (13:05 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78202: Opcache stats for cache hits are capped at 32bit NUM
Christoph M. Becker [Tue, 25 Jun 2019 11:04:28 +0000 (13:04 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78202: Opcache stats for cache hits are capped at 32bit NUM
Christoph M. Becker [Tue, 25 Jun 2019 07:56:33 +0000 (09:56 +0200)]
Fix #78202: Opcache stats for cache hits are capped at 32bit NUM
We use the proper format specifiers now.
Dmitry Stogov [Tue, 25 Jun 2019 09:41:06 +0000 (12:41 +0300)]
Prevent useless hash lookups
Derick Rethans [Tue, 25 Jun 2019 09:03:00 +0000 (09:03 +0000)]
Update NEWS for 7.4.0alpha3
Derick Rethans [Tue, 25 Jun 2019 09:01:40 +0000 (09:01 +0000)]
Update NEWS for PHP 7.4.0alpha2
Dmitry Stogov [Tue, 25 Jun 2019 08:26:29 +0000 (11:26 +0300)]
Keep lowercased parent class name as second argument of DECLARE_CLASS to avoid extra work at run-time
Nikita Popov [Mon, 24 Jun 2019 15:11:21 +0000 (17:11 +0200)]
Avoid confusing gotos in phar_split_cache_list
Nikita Popov [Mon, 24 Jun 2019 14:51:40 +0000 (16:51 +0200)]
Fix EVP_PKEY leak in phar
Nikita Popov [Mon, 24 Jun 2019 13:41:03 +0000 (15:41 +0200)]
Don't force USE_ZEND_ALLOC=0 in run-tests.php
USE_ZEND_ALLOC=0 is useful not just for valgrind ... we should not
force USE_ZEND_ALLOC=1 if the user explicitly disabled it.
Nikita Popov [Mon, 24 Jun 2019 07:30:59 +0000 (09:30 +0200)]
Fix region leak in mb_ereg_replace
Dmitry Stogov [Mon, 24 Jun 2019 17:32:27 +0000 (20:32 +0300)]
Fixed bug 78175 (Preloading must store default values of static variables and properties)
Christoph M. Becker [Sun, 23 Jun 2019 11:54:42 +0000 (13:54 +0200)]
Split test case
This test is failing on AppVeyor almost all of the time, so splitting
it seems appropriate. This also allows us to rid php_cli_server_stop()
which was only used by this test case.
Nikita Popov [Sat, 22 Jun 2019 08:19:49 +0000 (10:19 +0200)]
Add debugging code to time_sleep_until test
Derick Rethans [Fri, 21 Jun 2019 15:52:15 +0000 (16:52 +0100)]
Merge branch 'bug67348-mysqli-stat' into PHP-7.4
Derick Rethans [Fri, 21 Jun 2019 15:50:40 +0000 (16:50 +0100)]
Fixed bug #67348: Reading $dbc->stat modifies $dbc->affected_rows
Nikita Popov [Fri, 21 Jun 2019 14:52:08 +0000 (16:52 +0200)]
Fix stack leak in phpdbg
Nikita Popov [Fri, 21 Jun 2019 13:56:02 +0000 (15:56 +0200)]
Fix prompt leak in phpdbg
Christoph M. Becker [Fri, 21 Jun 2019 11:50:19 +0000 (13:50 +0200)]
Properly shut down font cache mutex
Since the font cache mutex in set up in MINIT, we have to shut it down
in MSHUTDOWN.
Andrey Hristov [Fri, 21 Jun 2019 13:33:01 +0000 (16:33 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
Andrey Hristov [Fri, 21 Jun 2019 13:32:13 +0000 (16:32 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
Andrey Hristov [Fri, 21 Jun 2019 13:30:25 +0000 (16:30 +0300)]
Add explicit cast to uint32_t.
It works even without it but explicit stuff is better. The compiler probably converts the 16-bit
uint16_t to uint32_t before doing the shift.
Nikita Popov [Fri, 21 Jun 2019 13:08:12 +0000 (15:08 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 21 Jun 2019 13:07:59 +0000 (15:07 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 21 Jun 2019 13:00:25 +0000 (15:00 +0200)]
Fix PKCS12 leak in openssl
Nikita Popov [Fri, 21 Jun 2019 12:43:15 +0000 (14:43 +0200)]
Fix d leak in ecc openssl_pkey_new
Nikita Popov [Fri, 21 Jun 2019 12:35:35 +0000 (14:35 +0200)]
Fix netscape spki leak in openssl
Nikita Popov [Fri, 21 Jun 2019 12:24:00 +0000 (14:24 +0200)]
Fix X509 leak in openssl_pkcs7_verify()
Nikita Popov [Fri, 21 Jun 2019 12:17:05 +0000 (14:17 +0200)]
Fix CSR leaks in openssl
Nikita Popov [Fri, 21 Jun 2019 12:03:06 +0000 (14:03 +0200)]
Free cert in php_openssl_load_stream_cafile()
X509_STORE_add_cert() increments the refcount of the cert, so we
should free it here.
Nikita Popov [Fri, 21 Jun 2019 10:10:09 +0000 (12:10 +0200)]
Fix memory leaks in browscap parsing
Also make the interning a bit more efficient, no need to check for
a "real" interned string every time, we can also store that in the
HT.
Nikita Popov [Fri, 21 Jun 2019 10:17:42 +0000 (12:17 +0200)]
Fix leak in bcpowmod
Nikita Popov [Fri, 21 Jun 2019 10:56:12 +0000 (12:56 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 21 Jun 2019 10:55:12 +0000 (12:55 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Niklas Keller [Fri, 3 Aug 2018 19:00:14 +0000 (21:00 +0200)]
Fix memory leak in TLS matches_san_list
Dmitry Stogov [Fri, 21 Jun 2019 08:43:17 +0000 (11:43 +0300)]
Cleanup
Nikita Popov [Fri, 21 Jun 2019 08:21:35 +0000 (10:21 +0200)]
Make ZEND_SEND_* flags unsigned
These may be shifted to the limit for the arg mask.
Nikita Popov [Fri, 21 Jun 2019 07:52:43 +0000 (09:52 +0200)]
Avoid ub in shift overflow check
Also fix an off-by-one error. While 1 << 63 overflows, -1 << 63 does
not.
Christoph M. Becker [Thu, 20 Jun 2019 21:40:51 +0000 (23:40 +0200)]
Support TGA reading
We add PHP bindings for libgd's features to read TGA files, which are
available as of libgd 2.1.0.
As PHP's bundled libgd doesn't yet include the respective features of the
external libgd, we add these.
Since TGA has no easily recognizable file signature, we don't add TGA
support for imagecreatefromstring() or getimagesize() and friends.
Christoph M. Becker [Thu, 20 Jun 2019 16:01:02 +0000 (18:01 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78189: file cache strips last character of uname hash
Christoph M. Becker [Thu, 20 Jun 2019 15:59:07 +0000 (17:59 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78189: file cache strips last character of uname hash
Christoph M. Becker [Thu, 20 Jun 2019 15:53:10 +0000 (17:53 +0200)]
Fix #78189: file cache strips last character of uname hash
We must not forget to increase `len` by one to cater to the directory
separator.
Nikita Popov [Thu, 20 Jun 2019 14:46:26 +0000 (16:46 +0200)]
Remove leftover check
This is checked below now in a way that handles misaligned pointers.
Nikita Popov [Thu, 20 Jun 2019 14:13:16 +0000 (16:13 +0200)]
Handle misaligned ifreq on macos
Nikita Popov [Thu, 20 Jun 2019 14:06:54 +0000 (16:06 +0200)]
Handle gr_mem misalignment on macos
Christoph M. Becker [Thu, 20 Jun 2019 15:00:33 +0000 (17:00 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS
Christoph M. Becker [Thu, 20 Jun 2019 14:59:39 +0000 (16:59 +0200)]
Update NEWS
Christoph M. Becker [Thu, 20 Jun 2019 14:54:17 +0000 (16:54 +0200)]
Rename test file to reflect the appropriate ticket number
Nikita Popov [Thu, 20 Jun 2019 13:48:48 +0000 (15:48 +0200)]
Check for dlsym as well
For some reason, when using GCC with address sanitizer, dlopen
is available without -ldl, but dlsym still needs it. Explicitly check
dlsym so we add the library.
Nikita Popov [Thu, 20 Jun 2019 12:14:46 +0000 (14:14 +0200)]
Handle gethostbyname misalignment on macos
Nikita Popov [Thu, 20 Jun 2019 13:03:44 +0000 (15:03 +0200)]
SOAP: Avoid indexing into null pointer
Nikita Popov [Thu, 20 Jun 2019 12:52:12 +0000 (14:52 +0200)]
FFI: Use signed arithmetic for pointer offset
offset can be negative here, using signed arithmetic avoids ubsan
warnings.
Nikita Popov [Thu, 20 Jun 2019 12:09:18 +0000 (14:09 +0200)]
In php_needle_char() use well-defined double->integer cast
...by going through zval_get_long(). Generally out of range double
casts are undefined.
Nikita Popov [Thu, 20 Jun 2019 11:06:56 +0000 (13:06 +0200)]
Avoid address calculation overflow
Nikita Popov [Thu, 20 Jun 2019 10:18:54 +0000 (12:18 +0200)]
Bail out earlier in zend_memnrstr
To avoid decrementing a null pointer lateron. As we need to check
for NULL here anayway, we should take the chance to bail out right
away.
Nikita Popov [Thu, 20 Jun 2019 10:11:30 +0000 (12:11 +0200)]
Disable float division by zero sanitizer for div_function
We intentionally divide by zero here and want to get IEEE-754
semantics.
Nikita Popov [Thu, 20 Jun 2019 08:52:18 +0000 (10:52 +0200)]
Change indexing scheme for symtable_cache
symtable_cache_ptr now points to the first unused symtable_cache
entry, rahter than the last used one. This avoids taking a pointer
to the minus first element of the array, which is UB. Instead we
take a pointer to the end plus one, which is not UB.
Remi Collet [Thu, 20 Jun 2019 09:59:04 +0000 (11:59 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
fix test for Windows and for parallel run
Remi Collet [Thu, 20 Jun 2019 09:58:49 +0000 (11:58 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
fix test for Windows and for parallel run
Remi Collet [Thu, 20 Jun 2019 09:58:32 +0000 (11:58 +0200)]
fix test for Windows and for parallel run
Remi Collet [Thu, 20 Jun 2019 09:52:25 +0000 (11:52 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
improve test clean section
move NEWS entry
Remi Collet [Thu, 20 Jun 2019 09:51:51 +0000 (11:51 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
improve test clean section
Remi Collet [Thu, 20 Jun 2019 09:51:18 +0000 (11:51 +0200)]
improve test clean section
Remi Collet [Thu, 20 Jun 2019 08:41:21 +0000 (10:41 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
move NEWS entry
Remi Collet [Thu, 20 Jun 2019 08:40:52 +0000 (10:40 +0200)]
move NEWS entry
Nikita Popov [Thu, 20 Jun 2019 08:35:22 +0000 (10:35 +0200)]
Fix maybe uninit warning
Remi Collet [Thu, 20 Jun 2019 08:28:26 +0000 (10:28 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
add test for #78185
Remi Collet [Thu, 20 Jun 2019 08:28:00 +0000 (10:28 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
add test for #78185
Remi Collet [Thu, 20 Jun 2019 08:27:33 +0000 (10:27 +0200)]
add test for #78185
Nikita Popov [Thu, 20 Jun 2019 08:09:54 +0000 (10:09 +0200)]
imagecolorallocate(): Check that RGB components are in-range
Instead of letting them bleed over into other components.
Nikita Popov [Thu, 20 Jun 2019 07:57:55 +0000 (09:57 +0200)]
Avoid overflow in mul range calculation
By using ZEND_SIGNED_MULTIPLY_LONG, which already implemented
efficient overflow checking logic.
Nikita Popov [Wed, 19 Jun 2019 09:58:42 +0000 (11:58 +0200)]
Backport "Avoid UB in overflow checks"
Cherry-pick of
bb940d9969e08853d92a09f7a02adc3228cf1c2c without
the JIT parts.