php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-27 09:42:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,274 Commits 547 Branches 1,481 Tags
021bb35aec685981dfdfd38bbfc109aa7d1d025f
Commit Graph

112274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov
021bb35aec Merge branch 'PHP-7.3' into PHP-7.4 2019-06-21 15:08:12 +02:00
Nikita Popov
66e4b78519 Merge branch 'PHP-7.2' into PHP-7.3 2019-06-21 15:07:59 +02:00
Nikita Popov
99f3e0f0ed Fix PKCS12 leak in openssl 2019-06-21 15:07:37 +02:00
Nikita Popov
c939a67866 Fix d leak in ecc openssl_pkey_new 2019-06-21 15:07:32 +02:00
Nikita Popov
dfe6f0c1c6 Fix netscape spki leak in openssl 2019-06-21 15:07:26 +02:00
Nikita Popov
a0da2fb2b7 Fix X509 leak in openssl_pkcs7_verify() 2019-06-21 15:07:18 +02:00
Nikita Popov
e0bafc6da4 Fix CSR leaks in openssl 2019-06-21 15:07:10 +02:00
Nikita Popov
90cb3743be Free cert in php_openssl_load_stream_cafile() 
X509_STORE_add_cert() increments the refcount of the cert, so we
should free it here.
 2019-06-21 15:07:00 +02:00
Nikita Popov
1de7c4b919 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.
 2019-06-21 12:56:37 +02:00
Nikita Popov
f781c8f110 Fix leak in bcpowmod 2019-06-21 12:56:28 +02:00
Nikita Popov
e7ef2b52db Merge branch 'PHP-7.3' into PHP-7.4 2019-06-21 12:56:12 +02:00
Nikita Popov
414db07bdb Merge branch 'PHP-7.2' into PHP-7.3 2019-06-21 12:55:12 +02:00
Niklas Keller
fea9f93166 Fix memory leak in TLS matches_san_list 2019-06-21 12:54:30 +02:00
Dmitry Stogov
e1e8e670df Cleanup 2019-06-21 11:43:17 +03:00
Nikita Popov
a84771573d Make ZEND_SEND_* flags unsigned 
These may be shifted to the limit for the arg mask.
 2019-06-21 10:24:34 +02:00
Nikita Popov
8227e0f747 Avoid ub in shift overflow check 
Also fix an off-by-one error. While 1 << 63 overflows, -1 << 63 does
not.
 2019-06-21 10:24:27 +02:00
Christoph M. Becker
81fd113506 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.
 2019-06-20 23:40:51 +02:00
Christoph M. Becker
2b4fc9eb9c Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Fix #78189: file cache strips last character of uname hash
 2019-06-20 18:01:02 +02:00
Christoph M. Becker
a85254b898 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78189: file cache strips last character of uname hash
 2019-06-20 17:59:59 +02:00
Christoph M. Becker
fcd6f2de60 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.
 2019-06-20 17:58:32 +02:00
Nikita Popov
59974000eb Remove leftover check 
This is checked below now in a way that handles misaligned pointers.
 2019-06-20 17:24:22 +02:00
Nikita Popov
dd6d471834 Handle misaligned ifreq on macos 2019-06-20 17:24:16 +02:00
Nikita Popov
d80f0ff6c0 Handle gr_mem misalignment on macos 2019-06-20 17:24:06 +02:00
Christoph M. Becker
a768271d91 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  Update NEWS
 2019-06-20 17:00:33 +02:00
Christoph M. Becker
a0f370e78a Update NEWS 2019-06-20 16:59:39 +02:00
Christoph M. Becker
ecae9100dc Rename test file to reflect the appropriate ticket number 2019-06-20 16:54:17 +02:00
Nikita Popov
6165c23475 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.
 2019-06-20 16:23:04 +02:00
Nikita Popov
26ac6cb6be Handle gethostbyname misalignment on macos 2019-06-20 16:22:40 +02:00
Nikita Popov
27d3373496 SOAP: Avoid indexing into null pointer 2019-06-20 16:22:34 +02:00
Nikita Popov
f127d77eef FFI: Use signed arithmetic for pointer offset 
offset can be negative here, using signed arithmetic avoids ubsan
warnings.
 2019-06-20 16:22:26 +02:00
Nikita Popov
d4de127dd8 In php_needle_char() use well-defined double->integer cast 
...by going through zval_get_long(). Generally out of range double
casts are undefined.
 2019-06-20 16:22:10 +02:00
Nikita Popov
e8ae19223c Avoid address calculation overflow 2019-06-20 16:22:04 +02:00
Nikita Popov
e4455c32ed 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.
 2019-06-20 16:21:53 +02:00
Nikita Popov
a59e0cfce5 Disable float division by zero sanitizer for div_function 
We intentionally divide by zero here and want to get IEEE-754
semantics.
 2019-06-20 16:21:47 +02:00
Nikita Popov
eaafb69eea 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.
 2019-06-20 16:21:39 +02:00
Remi Collet
961935fde2 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  fix test for Windows and for parallel run
 2019-06-20 11:59:04 +02:00
Remi Collet
676b564f43 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  fix test for Windows and for parallel run
 2019-06-20 11:58:49 +02:00
Remi Collet
d8202bf917 fix test for Windows and for parallel run 2019-06-20 11:58:32 +02:00
Remi Collet
522cf62906 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  improve test clean section
  move NEWS entry
 2019-06-20 11:52:25 +02:00
Remi Collet
d7597f73cc Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  improve test clean section
 2019-06-20 11:51:51 +02:00
Remi Collet
b3cfeda3c7 improve test clean section 2019-06-20 11:51:18 +02:00
Remi Collet
27b5b46cb9 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  move NEWS entry
 2019-06-20 10:41:21 +02:00
Remi Collet
c2ee2e4c74 move NEWS entry 2019-06-20 10:40:52 +02:00
Nikita Popov
e162a1c02e Fix maybe uninit warning 2019-06-20 10:35:22 +02:00
Remi Collet
fa70aedf03 Merge branch 'PHP-7.3' into PHP-7.4 
* PHP-7.3:
  add test for #78185
 2019-06-20 10:28:26 +02:00
Remi Collet
a197dc72c3 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  add test for #78185
 2019-06-20 10:28:00 +02:00
Remi Collet
63f2d88088 add test for #78185 2019-06-20 10:27:33 +02:00
Nikita Popov
4488475a3e imagecolorallocate(): Check that RGB components are in-range 
Instead of letting them bleed over into other components.
 2019-06-20 10:09:54 +02:00
Nikita Popov
117c7b3f65 Avoid overflow in mul range calculation 
By using ZEND_SIGNED_MULTIPLY_LONG, which already implemented
efficient overflow checking logic.
 2019-06-20 09:57:55 +02:00
Nikita Popov
3a97b8b4f9 Backport "Avoid UB in overflow checks" 
Cherry-pick of bb940d9969 without
the JIT parts.
 2019-06-20 09:51:05 +02:00