mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-29 04:46:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
110,353 Commits 500 Branches 1,381 Tags 818 MiB
6facfa59a5
Commit Graph

110353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov
f9895b4bf5 Fixed bug #78689 2019-10-29 15:06:16 +01:00
Stanislav Malyshev
8c2b3b0568 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix libmagic buffer overflow issue (CVE-2019-18218)
  bump version
  set versions for release
 2019-10-28 20:47:44 -07:00
Stanislav Malyshev
2bdb13a1f7 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix libmagic buffer overflow issue (CVE-2019-18218)
  bump version
  set versions for release
 2019-10-28 20:47:30 -07:00
Christoph M. Becker
736cd93ef5 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78751: Serialising DatePeriod converts DateTimeImmutable
 2019-10-28 13:08:34 +01:00
Christoph M. Becker
89c327f884 Fix #78751: Serialising DatePeriod converts DateTimeImmutable 
When getting the properties of a DatePeriod instance we have to retain
the proper classes, and when restoring a DatePeriod instance we have to
cater to DateTimeImmutable instances as well.
 2019-10-28 13:07:28 +01:00
Nikita Popov
b61b60d15b Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #78752
 2019-10-28 10:28:04 +01:00
Nikita Popov
16c4910876 Fix bug #78752 
NULL out the execute_data before destroying it, otherwise GC may
trigger while the execute_data is partially destroyed, resulting
in double-frees.

The handling of call stack unfreezing is a bit awkward because it's
a ZEND_API function, so we can't change the signature.
 2019-10-28 10:27:32 +01:00
Stanislav Malyshev
469820048d Fix libmagic buffer overflow issue (CVE-2019-18218) 
Ported from 46a8443f76
 2019-10-27 16:30:38 -07:00
Nikita Popov
74699533e5 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed bug #78747
 2019-10-25 12:50:12 +02:00
Nikita Popov
5249993814 Fixed bug #78747 2019-10-25 12:47:18 +02:00
Nikita Popov
813305b67f Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Use ICU's CXXFLAGS when using pkg-config
 2019-10-23 11:17:46 +02:00
Ryan Schmidt
8daf96cef3 Use ICU's CXXFLAGS when using pkg-config 
This mirrors how ICU's CXXFLAGS are already used when using icu-config.
 2019-10-23 11:17:37 +02:00
Nikita Popov
832b5c7b9d Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Add "-pthread" to EXTRA_LDFLAGS_PROGRAM as well
 2019-10-23 11:07:16 +02:00
Nikita Popov
fa89c41f37 Add "-pthread" to EXTRA_LDFLAGS_PROGRAM as well 
This is a backport of c518932c03
from the PHP 7.4 branch.
 2019-10-23 11:06:51 +02:00
Joe Watkins
52f049879a
bump version 2019-10-22 18:58:39 +02:00
Joe Watkins
326cd05dae
set versions for release 2019-10-22 18:56:55 +02:00
Christoph M. Becker
36943dfff1 Update NEWS 2019-10-22 09:50:11 +02:00
Remi Collet
c00fd843d7 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  add NEWS entry
 2019-10-22 09:37:51 +02:00
Remi Collet
2213bd36fd add NEWS entry 2019-10-22 09:37:35 +02:00
Stanislav Malyshev
57b4dcbe77 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
  bump versions after release
  set versions for release
 2019-10-21 13:17:19 -07:00
Stanislav Malyshev
4b5cdda0c7 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043)
  bump versions after release
  set versions for release
 2019-10-21 13:17:09 -07:00
Joe Watkins
1c9b62fbd4
Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #78697: inaccurate error message
 2019-10-21 09:23:26 +02:00
Fabien Villepinte
bea2ff88c9
Fix bug #78697: inaccurate error message 2019-10-21 09:22:09 +02:00
Jakub Zelenka
ab061f95ca Fix bug #78599 (env_path_info underflow can lead to RCE) (CVE-2019-11043) 2019-10-20 22:50:04 -07:00
Christoph M. Becker
4f50d58cab Fix #78633: Heap buffer overflow (read) in mb_eregi 
We backport kkos/oniguruma@15c4228aa2.
 2019-10-20 22:47:38 -07:00
Christoph M. Becker
ce035dc4a0 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78694: Appending to a variant array causes segfault
 2019-10-19 11:49:18 +02:00
Christoph M. Becker
45a7723267 Fix #78694: Appending to a variant array causes segfault 
`write_dimension` object handlers have to be able to handle `NULL`
`offset`s; for now we simply throw an exception instead of following
the `NULL` pointer.
 2019-10-19 11:47:00 +02:00
Christoph M. Becker
c7c7ab53ac Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #70153 \DateInterval incorrectly unserialized
 2019-10-18 15:32:08 +02:00
m.yakunin
d2cde0bfd3 Fix #70153 \DateInterval incorrectly unserialized 
Added a separate macro for reading 'days' property, so that bool(false)
is correctly converted to the proper internal representation.
 2019-10-18 15:31:14 +02:00
Derick Rethans
3725a446ba Import timelib version 2018.03 2019-10-15 21:00:39 +01:00
Joe Watkins
22ac57b064
Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix checksum calculation for opcache
 2019-10-14 16:49:48 +02:00
Mitch Hagstrand
e2a6bf482f
Fix checksum calculation for opcache 2019-10-14 16:46:42 +02:00
Christoph M. Becker
7439d48bea Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78665: Multicasting may leak memory
 2019-10-12 14:44:55 +02:00
Christoph M. Becker
900bdcbd03 Fix #78665: Multicasting may leak memory 2019-10-12 14:43:43 +02:00
Nikita Popov
74ac3dd6e2 Merge branch 'PHP-7.2' into PHP-7.3 2019-10-10 16:14:37 +02:00
Nikita Popov
46561dab6a Fix leak in phar open 2019-10-10 16:14:21 +02:00
Nikita Popov
4ba8d78100 Merge branch 'PHP-7.2' into PHP-7.3 2019-10-10 11:41:29 +02:00
Nikita Popov
96c84b7bc1 Fix leak on static method call on non-existent class 2019-10-10 11:40:49 +02:00
Nikita Popov
a0163417ef Merge branch 'PHP-7.2' into PHP-7.3 2019-10-09 17:33:44 +02:00
Nikita Popov
daf1fc6e31 Avoid float to int cast UB in exif 2019-10-09 17:33:29 +02:00
Christoph M. Becker
bbd481c11d Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix #78656: Parse errors classified as highest log-level
 2019-10-09 17:28:50 +02:00
Erik Lundin
3164186d53 Fix #78656: Parse errors classified as highest log-level 2019-10-09 17:27:32 +02:00
Nikita Popov
6fd6ad8f53 Fixed bug #78658 2019-10-09 17:00:27 +02:00
Nikita Popov
cbf589b17c Merge branch 'PHP-7.2' into PHP-7.3 2019-10-09 14:58:01 +02:00
Nikita Popov
d6ca174d5b Remove redundant components < 0 check 
components is an unsigned number, it cannot be smaller than zero.
 2019-10-09 14:57:24 +02:00
Nikita Popov
736af5f660 Merge branch 'PHP-7.2' into PHP-7.3 2019-10-08 16:13:17 +02:00
Sergei Turchanov
a8f60ac9dd Add pcre_get_compiled_regex_cache_ex() with local_aware flag 
A new function `pcre_get_compiled_regex_cache_ex()` is introduced,
which allows to compile regexp pattern using the "C" locale instead
of a current locale.

This will be needed to replace setlocale() usage in fileinfo,
which is not thread-safe.
 2019-10-08 16:11:55 +02:00
Christoph M. Becker
9fd555f99e Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Add missing SKIPIFs in exif tests
 2019-10-08 14:12:12 +02:00
Fabien Villepinte
46894580b0 Add missing SKIPIFs in exif tests 2019-10-08 14:11:32 +02:00
Nikita Popov
2fdd142f99 Check for exception after applying stream filters 
This makes the stream opening actually fail, and avoids assertion
failures when we tokenize with EG(exception) set.

Also avoid throwing an additional warning after an exception has
already been thrown.
 2019-10-08 12:32:57 +02:00