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
105,068 Commits 491 Branches 1,363 Tags 838 MiB
84881c654e
Commit Graph

46796 Commits

Author SHA1 Message Date
Anatol Belski
84881c654e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Reduce var scope
 2018-03-14 23:10:24 +01:00
Anatol Belski
efd0e7222b Reduce var scope 2018-03-14 22:59:54 +01:00
Anatol Belski
783778b9d3 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix stack use after scope
 2018-03-14 22:23:04 +01:00
Anatol Belski
7bcd55c264 Fix stack use after scope 2018-03-14 22:21:43 +01:00
Dmitry Stogov
2db6d8e415 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed use-after-free
 2018-03-14 09:14:16 +03:00
Dmitry Stogov
b6a41ad5ba Fixed use-after-free 2018-03-14 09:11:48 +03:00
Dmitry Stogov
5574562f8f Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Revert "More accurate symbolic constraints oferflow/unserflow handling (better fix for bug #76074)."
 2018-03-13 11:03:57 +03:00
Dmitry Stogov
0643c7ab4d Revert "More accurate symbolic constraints oferflow/unserflow handling (better fix for bug #76074)." 
This reverts commit 44ba557de5.
 2018-03-13 11:03:45 +03:00
Dmitry Stogov
575f5002c0 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  More accurate symbolic constraints oferflow/unserflow handling (better fix for bug #76074).
 2018-03-13 10:45:53 +03:00
Dmitry Stogov
44ba557de5 More accurate symbolic constraints oferflow/unserflow handling (better fix for bug #76074). 2018-03-13 10:44:53 +03:00
Xinchen Hui
e547c9f139 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76085 (Segmentation fault in buildFromIterator when directory name contains a \n)
 2018-03-13 12:52:07 +08:00
Xinchen Hui
4ee9098514 Fixed bug #76085 (Segmentation fault in buildFromIterator when directory name contains a \n) 2018-03-13 12:51:26 +08:00
Anatol Belski
c469213e7b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix heap use after free
 2018-03-12 21:02:40 +01:00
Anatol Belski
4cd64aad8a Fix heap use after free 
The value may only be used until PGresult was destroyed, thus it needs
to be copied.
 2018-03-12 20:57:21 +01:00
Anatol Belski
16570b8c79 Use literal as format 2018-03-12 16:00:24 +01:00
Anatol Belski
8a985403f6 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Use string literal as format
 2018-03-12 15:18:11 +01:00
Anatol Belski
eaa5b1f911 Use string literal as format 2018-03-12 15:17:08 +01:00
Dmitry Stogov
e6fb787c66 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Replaced usafe reference from SHM to process memory with SHM to SHM reference
 2018-03-12 11:18:33 +03:00
Dmitry Stogov
f31c4d5398 Replaced usafe reference from SHM to process memory with SHM to SHM reference 2018-03-12 11:18:12 +03:00
Christoph M. Becker
2b02e6dff3 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #62545: wrong unicode mapping in some charsets
 2018-03-11 17:54:45 +01:00
Christoph M. Becker
01ea314e8c Fix #62545: wrong unicode mapping in some charsets 
Undefined characters are best mapped to Unicode REPLACEMENT characters.
 2018-03-11 17:38:28 +01:00
Thomas Petazzoni
8489ecefd3 ext/sockets: make AI_IDN usage optional 
AI_IDN is not supported by all C libraries (uClibc, musl), so make it
optional, like AI_ALL.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 2018-03-11 16:35:17 +01:00
Bob Weinand
cfd0979be5 Merge branch 'PHP-7.1' into PHP-7.2 2018-03-10 15:21:16 +01:00
Bob Weinand
9c6df8a238 Fix bug #76074 (opcache corrupts variable in for-loop) 2018-03-10 15:20:45 +01:00
Anatol Belski
cf0012dad0 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault
 2018-03-10 11:20:11 +01:00
Anatol Belski
8417a23973 Fixed bug #76068 parse_ini_string fails to parse "[foo]\nbar=1|>baz" with segfault 2018-03-10 11:18:21 +01:00
Christoph M. Becker
d709922979 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix #73957: signed integer conversion in imagescale()
 2018-03-10 00:25:11 +01:00
Christoph M. Becker
f1b358c9a9 Fix #73957: signed integer conversion in imagescale() 
We must not pass values to `gdImageScale()` which cannot be represented
by an `unsigned int`.  Instead we return FALSE, according to what we
already did for negative integers.
 2018-03-10 00:17:09 +01:00
Dmitry Stogov
020a02ef9d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Replaced usafe reference from SHM to process memory with SHM to SHM reference.
 2018-03-06 02:47:01 +03:00
Dmitry Stogov
50949c9332 Replaced usafe reference from SHM to process memory with SHM to SHM reference. 2018-03-06 02:43:26 +03:00
Dmitry Stogov
b48d2f6d10 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Don't keep HashTable.pDestructor in SHM and always set it into ZVAL_PTR_DTOR in zval_array_dup(). Keeping pointer to a function in SHM is not safe because of ASLR.
 2018-03-06 01:00:14 +03:00
Dmitry Stogov
b711a96acb Don't keep HashTable.pDestructor in SHM and always set it into ZVAL_PTR_DTOR in zval_array_dup(). 
Keeping pointer to a function in SHM is not safe because of ASLR.
 2018-03-06 00:56:16 +03:00
Dmitry Stogov
b7ebf90221 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed invalid destructor
 2018-03-06 00:46:40 +03:00
Dmitry Stogov
a83581e223 Fixed invalid destructor 2018-03-06 00:46:19 +03:00
Dmitry Stogov
53baf6fa1d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed invalid destructor
 2018-03-05 23:33:53 +03:00
Dmitry Stogov
87553b0730 Fixed invalid destructor 2018-03-05 23:33:08 +03:00
Nikita Popov
634a1ff033 Merge branch 'PHP-7.1' into PHP-7.2 2018-03-05 15:32:39 +01:00
Nikita Popov
fd5bd37ab1 Revert "Fixed bug #75961 (Strange references behavior)" 
This reverts commit 94e9d0a2ae.

This code needs to be mindful about modifications to the array
happening during callback execution. It was written in a way that
only accessed the reference, which is guaranteed not to move. The
changed implementation instead accesses the array slot, leading to
use-after-free.

Run ext/standard/tests/array/bug61967.phpt under valgrind to see
the issue.
 2018-03-05 15:32:21 +01:00
Anatol Belski
54212dfbf9 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Include username into the file cache path
 2018-03-05 15:21:31 +01:00
Anatol Belski
27a603e811 Include username into the file cache path 2018-03-05 15:16:55 +01:00
Dmitry Stogov
a8fbb15311 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed "opcache.file_cache_fallback" mode.
 2018-03-05 16:15:38 +03:00
Dmitry Stogov
350082ed71 Fixed "opcache.file_cache_fallback" mode. 
It's not safe to change value of ZCG(accel_directives).file_cache_only, becuse it might be altered by INI subsystem.
Use global variable instead.
 2018-03-05 16:01:43 +03:00
Christoph M. Becker
d83467d70b Fix #76041: null pointer access crashed php 
We must not draw anti-aliased lines on palette images, because that is
not supported by `gdImageSetAAPixelColor()` and it wouldn't make much
sense to support it, due to the limitation to at most 256 colors.
 2018-03-02 17:18:45 +01:00
Anatol Belski
3c58b2c31a Remove TSRMLS_* 2018-03-01 12:12:11 +01:00
Bob Weinand
15d611e451 Merge branch 'PHP-7.1' into PHP-7.2 2018-02-28 02:35:44 +01:00
Bob Weinand
3f32bd9f43 Fix pcntl build on mac 
Apparently on mac WIF*(x) macros resolve to (*(int*)&x) (_W_INT macro in sys/wait.h), forcing the value to be a lvalue
 2018-02-28 02:13:28 +01:00
Stanislav Malyshev
ab9f9b5d3b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #75981: prevent reading beyond buffer start
 2018-02-26 22:26:55 -08:00
Stanislav Malyshev
a6f7760d57 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75981: prevent reading beyond buffer start
 2018-02-26 22:26:50 -08:00
Stanislav Malyshev
dde7a05978 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #75981: prevent reading beyond buffer start
 2018-02-26 22:26:26 -08:00
Stanislav Malyshev
523f230c83 Fix bug #75981: prevent reading beyond buffer start 2018-02-26 22:25:51 -08:00