php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-17 13:01:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
107,999 Commits 547 Branches 1,483 Tags
bf5a81364ca4eec1c1c7f6c148deabfd91bfa397
Commit Graph

48543 Commits

Author SHA1 Message Date
Anatol Belski
d82cb24e19 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix bug #76524 - ZipArchive memory leak
 2018-07-10 11:20:50 +02:00
Anatol Belski
ebb590b625 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #76524 - ZipArchive memory leak
 2018-07-10 11:19:54 +02:00
timurib
08f08858f3 Fix bug #76524 - ZipArchive memory leak 
Bugfix #76524: Free up zip internal state and adjust the tests for Windows

Bugfix #76524: Fix possible use after free for libzip 1.3.1

Bugfix #76524: Make the test independent of platform
 2018-07-10 11:18:37 +02:00
Dmitry Stogov
6c61f15408 Optimization 2018-07-10 00:04:44 +03:00
Anatol Belski
90edf754c5 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Sync callback signature with libxml2 2.9.8
 2018-07-09 21:25:19 +02:00
Anatol Belski
474292c3e4 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Sync callback signature with libxml2 2.9.8
 2018-07-09 21:24:51 +02:00
Anatol Belski
a820aab9da Sync callback signature with libxml2 2.9.8 2018-07-09 21:21:41 +02:00
Anatol Belski
cce87471b1 Skip test on incompatible servers 2018-07-09 16:39:58 +02:00
Anatol Belski
117c37da76 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Add missing flag
 2018-07-09 15:15:08 +02:00
Anatol Belski
a6e8c73c43 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Add missing flag
 2018-07-09 15:14:30 +02:00
Anatol Belski
2c43fb49d6 Add missing flag 2018-07-09 15:12:52 +02:00
Anatol Belski
c90f1964f9 Move to size_t for string length 2018-07-09 13:34:04 +02:00
Dmitry Stogov
67b4c3379a Uze ZVAL_COPY_DEREF() instead of ZVAL_DEREF() and ZVAL_COPY() 2018-07-09 12:46:46 +03:00
Kalle Sommer Nielsen
094c2aaf83 The session_array global is not used at all, so comment it out for now 2018-07-09 04:21:46 +02:00
Kalle Sommer Nielsen
529baa9a3d Added test to accompany the FILTER_SANITIZE_ADD_SLASHES filter 2018-07-09 03:59:35 +02:00
Kalle Sommer Nielsen
a8dce31957 Added the 'add_slashes' sanitization filter (FILTER_SANITIZE_ADD_SLASHES) as an alias to 'magic_quotes' (FILTER_SANITIZE_MAGIC_QUOTES) so we can move past our "magical" legacy. 2018-07-09 03:58:20 +02:00
Christoph M. Becker
1c01b1ab48 Fix #76594: Bus Error due to unaligned access in zend_ini.c OnUpdateLong 
Since commit ea83b69[1] changed the type of mbstring.strict_detection
from `long` to `zend_bool`, we have to update the `on_modify` callback
as well.

[1] http://git.php.net/?p=php-src.git;a=commit;h=ea83b69883f3f77fd27e4663fa854c88f141ab41
 2018-07-09 00:54:36 +02:00
Anatol Belski
e4a2cdb564 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed regex for checking libzip static lib
 2018-07-07 17:33:47 +02:00
Dylan K. Taylor
77a841db48 Fixed regex for checking libzip static lib 
This bug caused linking issues in debug mode (see bug [#76564](https://bugs.php.net/bug.php?id=76564))

This issue affects PHP 7.2 and master.
 2018-07-07 17:32:16 +02:00
Anatol Belski
0fbbdd3aa1 [ci skip] Fix EOL 2018-07-07 17:14:54 +02:00
Peter Kokot
b585f043cb Add missing INI directives to curl phpinfo 2018-07-07 12:11:49 +02:00
Nikita Popov
9aeeecc47c Merge branch 'PHP-7.2' 2018-07-07 12:08:27 +02:00
Nikita Popov
5d0d812a53 Merge branch 'PHP-7.1' into PHP-7.2 2018-07-07 12:08:02 +02:00
cdoco
47fb17b108 Fixed bug #76366 (references in sub-array for filtering breaks the filter) 2018-07-07 12:07:43 +02:00
seliver
95013042bf Fixed bug #76136 (stream_socket_get_name enclosed IPv6 in brackets) 
The IPv6 IP of a socket is provided by inet_ntop() as a string, but
this function doesn't enclose the IP in brackets. This patch adds
them in the php_network_populate_name_from_sockaddr() function.
 2018-07-07 11:47:50 +02:00
Nikita Popov
41a6625c09 Add UPGRADING for mb_ereg changes 
Also some minor code cleanup.
 2018-07-07 11:06:29 +02:00
ju1ius
8f1782678e adds support for named subpatterns to mb_ereg_replace 
Named subpatterns are now passed to `mb_ereg_replace_callback`.

This commit also adds a subset of the oniguruma back-reference syntax
for replacements:
* `\k<name>` and `\k'name'` for named subpatterns.
* `\k<n>` and `\k'n'` for numbered subpatterns
These last two notations allow referencing numbered groups where n > 9.
 2018-07-06 23:34:54 +02:00
ju1ius
212f56b7ca adds support for named captures to mb_ereg & mb_ereg_search 
`mb_ereg`, `mb_ereg_search_regs` & `mb_ereg_search_getregs`
returned only numbered capturing groups.
Now they return both numbered and named capturing groups.
Fixes Bug #72704.
 2018-07-06 23:34:54 +02:00
Zenju
69a49af0d3 Fix out-of bounds access 
Test case: strnatcmp_ex(L"333", 3, L"333 ", 4, true)
The reason this bug didn't come up earlier is probably because most input strings are null-terminated.
 2018-07-06 19:02:19 +02:00
Christoph M. Becker
b37dafcc23 Add test for PR #2382 2018-07-06 18:59:04 +02:00
Anatol Belski
1870a61a91 Fix coding style 2018-07-06 17:57:08 +02:00
David Carlier
9da4e30c75 random_bytes improvements for FreeBSD (from 12.x serie) 
giving the possiblity to pre-fill the buffer. A new getrandom
function was added for future version with a similar interface
than Linux's syscall.
 2018-07-06 17:47:59 +02:00
Anatol Belski
ed23cea9de Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix event log handling in startup phase
  Fix bug #76488 Memory leak when fetching a BLOB field
 2018-07-06 16:08:57 +02:00
Anatol Belski
d85651d58d Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix event log handling in startup phase
  Fix bug #76488 Memory leak when fetching a BLOB field
  Fix year
  Bump version
 2018-07-06 16:08:17 +02:00
sim1984
3847a6fcb6 Fix bug #76488 Memory leak when fetching a BLOB field 
Add a phpt test
 2018-07-06 16:07:28 +02:00
Xinchen Hui
9d1e9b73c5 rename ref_dtor_func to rc_dtor_func 2018-07-06 19:15:26 +08:00
Xinchen Hui
f9297387f4 Rename zval_dtor_func and ref_dotr_func 2018-07-06 18:47:30 +08:00
Xinchen Hui
e3355ac5ec Revert "Rename _zval_dtor_func to _ref_dtor_func" 
This reverts commit a362ae6b12.
 2018-07-06 18:37:45 +08:00
Xinchen Hui
a362ae6b12 Rename _zval_dtor_func to _ref_dtor_func 2018-07-06 18:32:27 +08:00
Nikita Popov
606de9e4a9 Fix inverted stristr() argument order in mysqli test 2018-07-05 21:25:21 +02:00
Nikita Popov
f3dc67b255 Merge branch 'PHP-7.1' into PHP-7.2 2018-07-05 19:11:25 +02:00
Nikita Popov
0c4ab798de Merge branch 'PHP-7.2' 2018-07-05 19:10:24 +02:00
Nikita Popov
0504594a28 Merge branch 'PHP-7.1' into PHP-7.2 2018-07-05 19:09:40 +02:00
Nikita Popov
791f07e4f0 Fix string.strip_tags filter 
Was segfaulting if no allowed tags are specified and performing an
out of bounds read if they were.
 2018-07-05 19:08:00 +02:00
Anatol Belski
0630e3bc03 Reduce error buffer size 
120 bytes is ample, the doc says.
 2018-07-05 17:24:38 +02:00
Dmitry Stogov
169d454593 Use zval_ptr_dtor() imstead of zval_dtor() 2018-07-05 17:55:54 +03:00
Dmitry Stogov
43d5a3665d It's safer to use zval_ptr_dtor() for iterator keys. 2018-07-05 16:56:52 +03:00
Dmitry Stogov
d0a6b1009f Use zval_ptr_dtor() to replace bound variables (original values nay be circular structures). 2018-07-05 16:46:38 +03:00
Dmitry Stogov
5f83904a5d Use zval_ptr_dtor_nogc() instead of zval_dtor() inplaces where circular-references are not possible 2018-07-05 15:25:55 +03:00
Dmitry Stogov
918a9f09f8 Use zval_ptr_dtor_nogc() in JSON parser (it can't produce circular data structures) 2018-07-05 15:07:16 +03:00