clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
109,731 Commits 491 Branches 1,363 Tags 838 MiB
61a38bb274
Commit Graph

109731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov
61a38bb274 SCCP: Fix leak when determining TYPE_CHECK from type info 
As TYPE_CHECK is the only opcode where we do something like this,
I'm adding this hack.
 2019-05-29 16:47:19 +02:00
Nikita Popov
de7d0256a3 Merge branch 'PHP-7.2' into PHP-7.3 2019-05-29 09:47:43 +02:00
Craig Duncan
5d67271db0 Add tests for DatePeriod properties 2019-05-29 09:47:10 +02:00
Christoph M. Becker
f3cd6931ca Update NEWS for 7.3.6 2019-05-29 09:27:23 +02:00
Remi Collet
582469eef2 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  add NEWS entries for sec fix
 2019-05-29 08:53:42 +02:00
Remi Collet
3051147019 add NEWS entries for sec fix 2019-05-29 08:53:23 +02:00
Joe Watkins
6c73b2088a
Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  disabled functions must not have return type
 2019-05-29 08:30:41 +02:00
Joe Watkins
7821cc3b9f
disabled functions must not have return type 2019-05-29 08:30:08 +02:00
Craig Duncan
72c330f1e6 Restore the execute bit for run-tests.php 
It looks like this was accidentally removed in 03f15f705a
 2019-05-28 21:51:26 +01:00
Nikita Popov
817b50826e Merge branch 'PHP-7.2' into PHP-7.3 2019-05-28 16:41:08 +02:00
Nikita Popov
59dfaa3f99 Fix type inference of SEND_UNPACK with empty array 
An empty array will not be turned into an array of references.
This violated the invariant than an array has values iff it has
keys.
 2019-05-28 16:40:56 +02:00
Joe Watkins
dee977b7a7
Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  bump version after release
 2019-05-28 09:54:15 +02:00
Joe Watkins
d661a75d54
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  bump version after release
 2019-05-28 09:53:32 +02:00
Joe Watkins
5533f2490a
bump version after release 2019-05-28 09:52:52 +02:00
Stanislav Malyshev
9d473f1eac Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #77967 - Bypassing open_basedir restrictions via file uris
 2019-05-27 21:36:05 -07:00
Stanislav Malyshev
fbb6a27212 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #77967 - Bypassing open_basedir restrictions via file uris
 2019-05-27 21:36:00 -07:00
Stanislav Malyshev
c34895e837 Fix bug #77967 - Bypassing open_basedir restrictions via file uris 2019-05-27 18:48:48 -07:00
Stanislav Malyshev
13dffa9d32 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
 2019-05-27 17:28:25 -07:00
Stanislav Malyshev
dc1d99e772 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
 2019-05-27 17:28:20 -07:00
Stanislav Malyshev
73ff4193be Fix bug #77988 - heap-buffer-overflow on php_jpg_get16 2019-05-27 17:28:09 -07:00
Stanislav Malyshev
e63b2ba310 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix function name
 2019-05-27 17:21:23 -07:00
Stanislav Malyshev
9bca9ef6cf Fix function name 2019-05-27 17:20:56 -07:00
Stanislav Malyshev
c7eb0feed8 Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Update NEWS
  Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
  Fix #77973: Uninitialized read in gdImageCreateFromXbm
 2019-05-27 16:49:25 -07:00
Stanislav Malyshev
e77c8e45ba Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
  Fix #77973: Uninitialized read in gdImageCreateFromXbm
 2019-05-27 16:49:19 -07:00
Stanislav Malyshev
16e037bd46 Update NEWS 2019-05-27 16:48:32 -07:00
Stanislav Malyshev
7cf7148a8f Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow 2019-05-27 16:32:42 -07:00
Christoph M. Becker
ed6dee9a19 Fix #77973: Uninitialized read in gdImageCreateFromXbm 
We have to ensure that `sscanf()` does indeed read a hex value here,
and bail out otherwise.
 2019-05-27 16:11:32 -07:00
Nikita Popov
0cb43ec51c Merge branch 'PHP-7.2' into PHP-7.3 2019-05-27 17:43:13 +02:00
Michael Maroszek
a0c9d0849a Fixed bug #76345 2019-05-27 17:42:20 +02:00
Nikita Popov
31ce1cbbb9 Func info: Fix calls to zero-arg varargs 
The num_args does not include variadics, so a "zero-arg" function
may accept additional arguments through that. No functions seem
to be affected right now, but they will be after #4175.
 2019-05-27 16:14:51 +02:00
Jakub Zelenka
209b12e064 Merge branch 'PHP-7.2' into PHP-7.3 2019-05-26 18:49:52 +01:00
Jakub Zelenka
8baf3ffde6 Add fpmi to the opcache supported sapis 2019-05-26 18:47:22 +01:00
Nikita Popov
6f9dfd9473 Fix bug #77955 
Free metadata before freeing the arena. I don't have a repro script,
but the added assertion fails for many existing tests prior to this
change.
 2019-05-23 13:40:52 +02:00
Nikita Popov
b394654c1e Merge branch 'PHP-7.2' into PHP-7.3 2019-05-23 11:12:59 +02:00
Nikita Popov
9a74b23297 Fixed bug #78038 socket_select with references 2019-05-23 11:12:15 +02:00
Dmitry Stogov
d4867e099e Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fixed race condition in opcache restart
 2019-05-23 00:21:04 +03:00
Dmitry Stogov
fa6a4483e6 Fixed race condition in opcache restart 2019-05-23 00:20:35 +03:00
Dmitry Stogov
aa9c76d027 Fixed dump of constant flags 2019-05-22 22:59:40 +03:00
Nikita Popov
f308aa4e1e Merge branch 'PHP-7.2' into PHP-7.3 2019-05-22 12:45:16 +02:00
Sjon Hortensius
96404eb8e2 Fix #77956 - When mysqli.allow_local_infile = Off, return a client error 2019-05-22 12:44:55 +02:00
Christoph M. Becker
69c634a56d Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix test case for cURL 7.65.0
 2019-05-22 12:02:03 +02:00
Christoph M. Becker
62fe6ba20c Fix test case for cURL 7.65.0 
Reported and patch provided by @Jan-E.
 2019-05-22 12:01:23 +02:00
Nikita Popov
3a719696bc Merge branch 'PHP-7.2' into PHP-7.3 2019-05-22 11:43:26 +02:00
Nikita Popov
3a0de243c3 Use a different URL in bug44811.phpt 2019-05-22 11:41:51 +02:00
Rasmus Lerdorf
2d29263a9f Merge branch 'PHP-7.2' into PHP-7.3 
* PHP-7.2:
  Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select
 2019-05-21 14:46:24 -07:00
Rasmus Lerdorf
7b42cdf95e Fix precedence issue causing sub-second timeouts to be 0 in 
curl_multi_select
 2019-05-21 14:44:11 -07:00
Nikita Popov
97ba6b0d8b Don't evaluate functions with partial array arguments 2019-05-21 17:35:03 +02:00
Nikita Popov
30f1b17262 Fix null check in sccp add_array_elem chain handling 
We need to check result_use rather than result_def for a null zval.
Previously we were later assuming that the null zval is really a
partial array, which does not go well.
 2019-05-21 17:15:07 +02:00
Nikita Popov
fc4836b193 Fix partial array handling in FE_RESET edge feasibility 2019-05-21 16:59:27 +02:00
Nikita Popov
cd188d0398 Handle partial arrays in zend_is_true() checks 2019-05-21 16:53:34 +02:00