php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-18 21:41:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
110,124 Commits 547 Branches 1,483 Tags
d295e1dce23cf49774419e7baf29373eabbbed8d
Commit Graph

110124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christoph M. Becker
d295e1dce2 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Revert "Fix #78620: Out of memory error"
 2019-10-02 19:02:28 +02:00
Christoph M. Becker
f2fb37a772 Revert "Fix #78620: Out of memory error" 
This reverts commit 8ce04df7e0.

Cf. <https://github.com/php/php-src/pull/4766#discussion_r330658679>.
 2019-10-02 19:01:35 +02:00
Christoph M. Becker
752a34fb2c Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78620: Out of memory error
 2019-10-02 18:20:09 +02:00
Christoph M. Becker
8ce04df7e0 Fix #78620: Out of memory error 
If the integer addition in `ZEND_MM_ALIGNED_SIZE_EX` overflows, the
macro evaluates to `0`, what we should catch early.
 2019-10-02 18:18:52 +02:00
Nikita Popov
3c42471ef8 Merge branch 'PHP-7.2' into PHP-7.3 2019-10-02 12:07:19 +02:00
Nikita Popov
a5d3620d93 Fix segfault with __COMPILER_HALT_OFFSET__ and trailing {} 
Fixes OSS-Fuzz #17895.
 2019-10-02 12:07:15 +02:00
Dmitry Stogov
f7596d1b5b Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed test that "fails" from time to time
 2019-10-02 00:57:16 +03:00
Dmitry Stogov
3124129ca8 Fixed test that "fails" from time to time 2019-10-02 00:54:59 +03:00
Dmitry Stogov
848bc776ea Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed test that "fails" from time to time
 2019-10-02 00:49:27 +03:00
Dmitry Stogov
2fcb5eadbb Fixed test that "fails" from time to time 2019-10-02 00:48:42 +03:00
Christoph M. Becker
2fc5d00afa Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Add missing skip keyword in tests
 2019-10-01 11:15:12 +02:00
Fabien Villepinte
209e37db7d Add missing skip keyword in tests 2019-10-01 11:13:36 +02:00
Nikita Popov
0805e132b0 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-30 15:06:32 +02:00
Nikita Popov
6fcde56b03 Fixed bug #78612 2019-09-30 15:06:07 +02:00
Christoph M. Becker
2046b3ce4f Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78609: mb_check_encoding() no longer supports stringable objects
 2019-09-30 13:04:54 +02:00
Sergei Turchanov
e546d721e8 Fix #78413: php-fpm request_terminate_timeout does not take effect after fastcgi_finish_request 
To retain legacy behavior I decided to add an option to control request
termination logic. If request_terminate_timeout_track_finished is set,
then request will be tracked for time limits even after
fastcgi_finish_request was called.

This patch depends on the fix provided in BUG 78469 (otherwise php-fpm
workers listening on named pipes on Windows will be erroneously terminated)
(PR #4636)
 2019-09-30 12:54:09 +02:00
Christoph M. Becker
45db6fa567 Fix #78609: mb_check_encoding() no longer supports stringable objects 
We apply type juggling for other types than array.
 2019-09-30 12:42:04 +02:00
Christoph M. Becker
466f91bb3b Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix build for libzip < 0.11.2
 2019-09-29 13:34:16 +02:00
Christoph M. Becker
f6bfbe9553 Fix build for libzip < 0.11.2 
We must not define method entries, if the actual method definitions or
the arginfo structures are not defined.
 2019-09-29 13:33:18 +02:00
Nikita Popov
7df50ef147 Don't throw warnings during heredoc scan-ahead 
Otherwise these warnings will turn up twice (or more...)
 2019-09-28 17:15:36 +02:00
Christoph M. Becker
66c48e8694 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix SKIPIF in ext/mysqli
 2019-09-27 16:04:00 +02:00
Fabien Villepinte
37d27e666a Fix SKIPIF in ext/mysqli 2019-09-27 16:03:20 +02:00
Christoph M. Becker
878704ff6f Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix skipif.inc
 2019-09-27 12:51:21 +02:00
Christoph M. Becker
115f6effec Fix skipif.inc 2019-09-27 12:50:04 +02:00
Nikita Popov
91c4abcfcc Merge branch 'PHP-7.2' into PHP-7.3 2019-09-26 13:47:19 +02:00
Nikita Popov
ab938d7bbc Fix memory leak with ** on array operands 2019-09-26 13:45:45 +02:00
Nikita Popov
99c67804d5 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-26 10:25:40 +02:00
Nikita Popov
8a9df88597 Fix null-pointer deref in if stmt printing 
Fixes OSS-Fuzz #17721.
 2019-09-26 10:24:49 +02:00
Nikita Popov
915fe2fdc6 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-25 10:34:25 +02:00
Jinesh Patel
d2331cc3f2 Fix hash key length in umsg_parse_format() 
Fix array length passed to zend_hash_str_find_ptr() casting from
UChar array to char array requires mul by sizeof(UChar).
 2019-09-25 10:30:33 +02:00
Christoph M. Becker
7530938670 Update NEWS 2019-09-24 11:13:55 +02:00
Christoph M. Becker
8f949eba80 Fix #78559: Heap buffer overflow in mb_eregi 
We backport kkos/oniguruma@d3e402928b.
 2019-09-23 21:49:55 -07:00
Christoph M. Becker
8c9c58436b Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix NEWS entry
 2019-09-23 23:03:07 +02:00
Christoph M. Becker
ed099ab186 Fix NEWS entry 
Cf. <https://bugs.php.net/78590>.
 2019-09-23 22:59:55 +02:00
Nikita Popov
954d073833 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-23 17:18:33 +02:00
Nikita Popov
3ddb63dce1 Fix skipif condition 2019-09-23 17:17:52 +02:00
Nikita Popov
d0f4966b05 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-23 16:42:33 +02:00
Nikita Popov
bc4c4c658c Skip test on 32-bit 2019-09-23 16:42:24 +02:00
Nikita Popov
087051c9a5 Skip test on 32-bit 2019-09-23 14:52:32 +02:00
Nikita Popov
1a184f030a Commit regenerated var_unserializer.c 2019-09-23 13:47:05 +02:00
Nikita Popov
f53af9ac23 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-23 13:18:39 +02:00
Nikita Popov
8509970e6a Fix signed integer overflow in SplObjectStorage unserialization 
If count is ZEND_LONG_MIN the count-- loop underflows. This is
ultimately harmless, but results in a ubsan warning.

Fix this by adding a sanity check that the count isn't negative,
because that doesn't make sense...
 2019-09-23 13:18:27 +02:00
Nikita Popov
e65adc9c19 Fix ubsan violation in parse_iv2 
This fixes two issues:
 * Negative the value in an unsigned type to avoid signed overflow.
 * Treat -0 as 0 rather than an invalid number that gets converted
   to ZEND_LONG_MIN.
 2019-09-23 13:08:44 +02:00
Christoph M. Becker
9c89f43d55 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix test to be skipped if dom is not available
 2019-09-22 18:42:40 +02:00
Christoph M. Becker
697945aa89 Fix test to be skipped if dom is not available 2019-09-22 18:42:02 +02:00
Nikita Popov
9cd365e571 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-22 12:10:42 +02:00
Nikita Popov
f989a4cd44 Fix leak of temporary buffer during exif tag reading 2019-09-22 12:10:17 +02:00
Nikita Popov
623d897998 Merge branch 'PHP-7.2' into PHP-7.3 2019-09-22 10:26:57 +02:00
Nikita Popov
0701835c01 Fix multiple leaks in exif_read_data() 
This fixes two leaks related to duplicate tags, as well as a leak
of zero-length FMT_(S)BYTE with non-null value. This can show up
for MAKERNOTE values where the original length is non-zero, but
the first character is a null byte.
 2019-09-21 20:40:03 +02:00
Christoph M. Becker
33e556fab4 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix length of key passed to zend_hash_str_find_ptr
 2019-09-21 18:12:27 +02:00