bba88eb6a1
Merge branch 'PHP-7.4'
2019-06-19 15:36:31 +02:00
c10cb47b5f
Fix uninitialized variable
...
I mistakenly moved len1 initialization into the conditional as well.
2019-06-19 15:34:51 +02:00
3645292235
Merge branch 'PHP-7.4'
2019-06-19 15:09:39 +02:00
ea97fc9c1f
Fix shift UB in gd_io.c
...
This has already been fixed upstream in
https://github.com/libgd/libgd/commit/24d352576c024769d18113a28f3be03d54fa1e66
and
https://github.com/libgd/libgd/commit/772d0107a6b00a0d6d7191383fe984f8c018b48c .
2019-06-19 15:09:00 +02:00
1c018af682
Fix shift UB in php_ifd_get32s
2019-06-19 15:09:00 +02:00
b1196e2128
Phar: Avoid negative zip dates
...
The zip date/time encoding format is incredibly stupid.
2019-06-19 15:09:00 +02:00
7bf6326259
Fix memcpy null UB in phar
2019-06-19 15:09:00 +02:00
ae2bc6297e
Fix shift UB in mbfilter_utf32.c
2019-06-19 15:09:00 +02:00
f65046b951
Fix shift UB in sint4korr()
2019-06-19 15:09:00 +02:00
22765160da
Fix incorrect shift in mysqlnd_wireprotocol
...
This one looks like a genuine bug: We're shifting a uint16_t by
16 bits. On x86 that likely results in no shift happening.
2019-06-19 15:09:00 +02:00
4ae87f4bf9
Fix overflow UB in range()
2019-06-19 15:09:00 +02:00
8740533ddf
Avoid more UB in round()
2019-06-19 15:09:00 +02:00
4b5e824aae
Use unsigned char in _crypt_extended_r
...
Avoid signed shift UB.
2019-06-19 15:09:00 +02:00
bee7973e52
Use unsigned chars in php_uuencode()
...
Avoid shift UB on signed integers.
2019-06-19 15:09:00 +02:00
0c0659dc50
Fix _php_math_round UB
...
php_intlog10abs() is ill-defined for a zero value. Avoid calling it
altogether as there's nothing to round with a zero value.
2019-06-19 15:09:00 +02:00
317dfab81b
Fix memcpy null arg UB
2019-06-19 15:09:00 +02:00
37cd86080f
Merge branch 'PHP-7.4'
...
* PHP-7.4:
fix setcookie Max-Age to use php_time
2019-06-19 12:43:26 +02:00
11f30d67ea
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
fix setcookie Max-Age to use php_time
2019-06-19 12:43:17 +02:00
a5db319463
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
fix setcookie Max-Age to use php_time
2019-06-19 12:42:25 +02:00
31a1c1e67c
fix setcookie Max-Age to use php_time
2019-06-19 12:42:00 +02:00
264536877d
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
export php_time
2019-06-19 12:40:23 +02:00
599b94ff14
export php_time
2019-06-19 12:39:51 +02:00
bb940d9969
Avoid UB in overflow checks
...
Some of the overflow checks in zend_may_overflow were optimized
away by clang, causing JIT failures on release macos.
2019-06-19 12:02:42 +02:00
8cc26690b5
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Resolve discrepencies between second value yielded by gettimeofday and time, fixes #69044
2019-06-19 09:01:59 +02:00
fb95043acf
Merge branch 'PHP-7.3' into PHP-7.4
...
* PHP-7.3:
Resolve discrepencies between second value yielded by gettimeofday and time, fixes #69044
2019-06-19 09:01:20 +02:00
025899e3b5
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Resolve discrepencies between second value yielded by gettimeofday and time, fixes #69044
2019-06-19 08:59:04 +02:00
65067dff01
Resolve discrepencies between second value yielded by gettimeofday and time, fixes #69044
2019-06-19 08:56:20 +02:00
d54220bc79
Fix #78173 : XML-RPC mutates immutable objects during encoding
...
With opcache.protect_memory=1 enabled, the XML-RPC extension causes a
segfault on PHP 7.2 as it is modifying the recursion counter of objects
it touches, without first checking if they are immutable or not.
This doesn't affect 7.3+
2019-06-18 17:08:11 +02:00
c8d27777d6
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fixed bug #78175 (Preloading segfaults at preload time and at runtime)
2019-06-18 17:19:19 +03:00
148eb20226
Fixed bug #78175 (Preloading segfaults at preload time and at runtime)
2019-06-18 17:18:49 +03:00
a88bfff59a
Remove ZPP tests from ext/ldap
2019-06-18 16:11:24 +02:00
22b2d9d088
Fixed JIT failure, on ZTS build without global register vatriables
2019-06-18 13:52:52 +03:00
41067a22e9
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Turn system_id into a true global
2019-06-18 10:27:50 +02:00
04a6aac59b
Turn system_id into a true global
...
The system_id is identical for all threads and can be computed during
module startup, so there is no need to calculate and store it for each
thread.
2019-06-18 10:27:35 +02:00
9bcbd80775
Merge branch 'PHP-7.4'
...
* PHP-7.4:
fix flaky socket test
2019-06-18 08:31:32 +02:00
68785c00ef
fix flaky socket test
2019-06-18 08:30:46 +02:00
47bb32e056
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Implement SQLite3 backup API
2019-06-17 23:36:43 +02:00
ce22ccc77b
Implement SQLite3 backup API
2019-06-17 23:34:51 +02:00
820cc55326
Merge branch 'PHP-7.4'
2019-06-17 17:26:07 +02:00
d924b426c9
Fix file clash in fgetcsv test
2019-06-17 17:25:43 +02:00
7b6aecfe5b
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Improve create_verify_dir() diagnostics
2019-06-17 16:51:13 +02:00
e58e2fd0d4
Improve create_verify_dir() diagnostics
...
If create_verify_dir() fails[1], we need more info why that happened.
[1] <https://ci.appveyor.com/project/cmb69/php-src/builds/25324138/job/dm1n12gqhdqa3ln5#L5753 >
2019-06-17 16:49:52 +02:00
7a236b6761
Attempt to fix JIT on Mac OSX ZTS build
2019-06-17 17:08:58 +03:00
fe02725ac9
Merge branch 'PHP-7.4'
2019-06-17 15:09:22 +02:00
4e9a65447f
Fix file conflicts in SplFileObject fputcsv tests
2019-06-17 15:08:52 +02:00
5dbcbab4cc
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Remove XFAIL mark
2019-06-17 14:56:42 +03:00
938d2359ae
Remove XFAIL mark
2019-06-17 14:56:28 +03:00
cf50cab7bb
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Avoid uninitilized field access
2019-06-17 14:54:28 +03:00
eda916cc98
Avoid uninitilized field access
2019-06-17 14:53:44 +03:00
3e0b09a83c
Merge branch 'PHP-7.4'
...
* PHP-7.4:
Fixed memory leaks in ext/ffi/tests/100.phpt on Mac OSX
2019-06-17 14:40:48 +03:00
Nikita Popov