Tyson Andre
cdb7aafc23
Fix memory leak(null coalescing operator with Spl hash)
...
The SEPARATE_ARG_IF_REF macro increased the refcount of the object passed as a
key.
However, when the key did not exist in the ArrayAccess implementation,
the code returned early without trying to decrement the refcount.
Add a test of `??` succeeding+failing on a SplObjectStorage instance.
2016-11-20 15:46:13 -08:00
Jakub Zelenka
60574ea1ac
Fix bug #73526 (php_json_encode depth issue)
2016-11-20 20:36:03 +00:00
Craig Duncan
685b1292e9
Fix bug #73538
...
Remove any previous default headers and replace with the specified
ones, as documented, and as is the case when a single header is
passed.
2016-11-20 21:18:28 +01:00
Xinchen Hui
ebfd93f725
Fixed bug #73483 (Segmentation fault on pcre_replace_callback)
2016-11-20 15:44:27 +08:00
Anatol Belski
48191010d5
fix test portability
2016-11-18 22:10:41 +01:00
Mitch Hagstrand
55980684f6
Fix the lchwon error test for Travis CI.
...
The E_WARNING message from the PHP function lchown is passed
from the system function lchown. The error message returned
from lchown can be filesystem dependent.
2016-11-18 17:55:44 +01:00
Dmitry Stogov
97b65cc9c2
Fixed memory leaks in parse_ini_file()
2016-11-18 16:17:52 +03:00
Dmitry Stogov
05d382e7ec
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:php-src:
Updated NEWS
Improvement for bug73297
Simplify ext/standard/tests/http/bug73297.phpt
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
Add failing test for bug#73297
2016-11-17 14:07:11 +03:00
Dmitry Stogov
c2173c16d0
Fixed 64-bit build
2016-11-17 14:05:22 +03:00
Julien Pauli
4b2cbc3f2f
Improvement for bug73297
2016-11-17 11:51:53 +01:00
Rowan Collins
66ac73bee8
Simplify ext/standard/tests/http/bug73297.phpt
2016-11-17 11:51:53 +01:00
Rowan Collins
94374c51e7
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
2016-11-17 11:51:53 +01:00
Rowan Collins
4683377dfa
Add failing test for bug#73297
2016-11-17 11:51:53 +01:00
Julien Pauli
49030f2a25
Improvement for bug73297
2016-11-17 11:33:36 +01:00
Dmitry Stogov
a67637039f
Prevent modification of immutable arrays (ext/mbstring/tests/bug26639.phpt failure with opcache.protect_memory=1)
2016-11-17 13:33:05 +03:00
Dmitry Stogov
d4b3f89c53
Overflow check
2016-11-17 13:17:34 +03:00
Rowan Collins
eba5e276c7
Simplify ext/standard/tests/http/bug73297.phpt
2016-11-17 11:04:57 +01:00
Rowan Collins
aec1a5eccc
http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses
2016-11-17 11:04:56 +01:00
Rowan Collins
6122526cea
Add failing test for bug#73297
2016-11-17 11:04:56 +01:00
Dmitry Stogov
5e001c34ec
Skip 64-bit specific tests on 32-bit systems
2016-11-17 11:44:28 +03:00
Dmitry Stogov
27542d9c9d
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Accorate handling of too big inodes of chroot directories
2016-11-17 01:14:23 +03:00
Dmitry Stogov
9849c97b1b
Accorate handling of too big inodes of chroot directories
2016-11-17 01:08:42 +03:00
Mitch Hagstrand
1d8be7c044
Fix #73546 : Logging for opcache has an empty file name
2016-11-16 21:30:40 +01:00
Dmitry Stogov
71ee641327
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
"opcache.validate_root" is useless on Windows
2016-11-16 23:19:56 +03:00
Dmitry Stogov
935d922114
"opcache.validate_root" is useless on Windows
2016-11-16 23:15:14 +03:00
Nuno Lopes
d26b8804d0
fix gcov coverage
2016-11-16 15:11:07 -05:00
Dmitry Stogov
8e350a627a
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Use full path
2016-11-16 23:05:00 +03:00
Dmitry Stogov
8202b97077
Use full path
2016-11-16 23:01:40 +03:00
Dmitry Stogov
99e5d6c4a5
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
...
* 'PHP-7.0' of git.php.net:php-src:
2016-11-16 16:47:05 +03:00
Dmitry Stogov
a91f3d475e
Fixed ZTS build
2016-11-16 16:43:57 +03:00
Christoph M. Becker
936cafe33e
Merge branch 'PHP-5.6' into PHP-7.0
2016-11-16 12:00:39 +01:00
Christoph M. Becker
eb570294a2
Fix #73530 : Unsetting result set may reset other result set
...
Calling sqlite3_reset() when a result set object is freed can cause
undesired and maybe even hard to track interference with other result
sets. Furthermore, there is no need to call sqlite3_reset(), because
that is implicitly called on SQLite3Stmt::execute(), and users are
encouraged to explicitly call either SQLite3Result::finalize() or
SQLite3Stmt::reset() anyway.
2016-11-16 11:49:04 +01:00
Dmitry Stogov
a1a5b52f3b
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #69090 (check cached files permissions)
2016-11-16 12:49:50 +03:00
Dmitry Stogov
ecba563f2f
Fixed bug #69090 (check cached files permissions)
2016-11-16 12:43:10 +03:00
jhdxr
0bd63959c9
move declaration of vars to top
2016-11-13 05:32:24 +00:00
jhdxr
9ad2083773
add test for #69587
2016-11-13 05:32:24 +00:00
jhdxr
23f9e48273
fix bug #69587 DateInterval properties and isset
2016-11-13 05:32:24 +00:00
Edgar R. Sandi
72be8de39f
fixed bug generated by fixes bug #73135
2016-11-12 17:43:16 +00:00
Edgar R. Sandi
1631c61feb
phpt file to bug #73135
2016-11-12 17:43:16 +00:00
Edgar R. Sandi
319822b050
fixes bug #73135
2016-11-12 17:43:16 +00:00
Joshua Rogers
1b8cfaf23d
Fix integer overflow in calender.
...
Fix int overflows in conversation functions for calendar.
Add tests for the overflows.
2016-11-12 17:33:51 +00:00
Jean Carlo Machado
f578ce3a13
added a test for date_interval_format function
2016-11-12 09:57:50 +00:00
Joe Watkins
ff1986e4d7
Merge branch 'pull-request/2198'
2016-11-12 08:16:01 +00:00
Nikita Popov
bb3d0c0e17
Fcall optimization: Avoid FETCH_DIM_R with UNUSED op2
2016-11-10 21:36:46 +01:00
Dmitry Stogov
15ac490472
Don't update proprties inplace.
2016-11-10 12:32:07 +03:00
Anatol Belski
e87daf363b
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
fix memory leak
2016-11-08 12:16:39 +01:00
Anatol Belski
d6d08f97cd
fix memory leak
2016-11-08 12:12:58 +01:00
Anatol Belski
2b30b54275
Merge remote-tracking branch 'phpsec/PHP-7.0.13' into PHP-7.0
...
* phpsec/PHP-7.0.13:
Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
Fix #72696 : imagefilltoborder stackoverflow on truecolor images
Fix #72482 : Ilegal write/read access caused by gdImageAALine overflow
Fix bug #73144 and bug #73341 - remove extra dtor
remove unreferenced var came in with merge
Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
fix version
set versions
2016-11-08 11:13:29 +01:00
Anatol Belski
33766347cb
Merge remote-tracking branch 'phpsec/PHP-5.6.28' into PHP-5.6
2016-11-08 11:06:52 +01:00
Anatol Belski
ef55a4b5b3
Enable FTS4 and FTS5 for bundled libsqlite
...
FTS3 is already enabled by default, and the other FTS versions
seems just to have been missed. Given that, the other FTS plugins
look like a low impact so worth a try. The current bundled libsqlite
versions in 7.x are proven stable already and support FTS5.
2016-11-08 02:26:43 +01:00
Anatol Belski
0c2156d190
avoid unneeded copying
2016-11-07 21:09:03 +01:00
Anatol Belski
f0676cbe20
Add test for bug #73448
2016-11-07 20:39:51 +01:00
Anatol Belski
3558e70e58
Fixed bug #73448 odbc_errormsg returns trash, always 513 bytes
2016-11-07 20:18:29 +01:00
Jakub Zelenka
493b2bff02
Fix bug #72776 (Invalid parameter in memcpy function trough openssl_pbkdf2)
2016-11-06 20:40:51 +00:00
Nikita Popov
b2af4e8868
Complete the fix of bug #70172 for PHP 7
2016-11-05 23:06:27 +01:00
Dorin Marcoci
3d73f718b2
Fix blob parameters binding. Fixes : #73087 , #61183 , #71494
...
Adjusted formatting according to requirements
Test case for bug #73087
2016-11-05 22:49:16 +01:00
Stanislav Malyshev
3b78cabc88
More int->size_t and string overflow fixes
2016-11-05 14:00:47 -07:00
Anatol Belski
617f38b0e0
fix dir separator in test
2016-11-04 18:29:54 +01:00
Anatol Belski
a61eade827
fix dir separator
2016-11-04 13:10:52 +01:00
Stanislav Malyshev
d858b4c77f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Add length check for bzcompress too - fix for bug #73356
2016-11-03 22:30:46 -07:00
Stanislav Malyshev
40f7fea897
Add length check for bzcompress too - fix for bug #73356
2016-11-03 22:10:22 -07:00
Stanislav Malyshev
2fa455128c
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
More string length checks & fixes
2016-11-03 22:05:25 -07:00
Stanislav Malyshev
1fd18821e0
More string length checks & fixes
2016-11-03 21:35:09 -07:00
Stanislav Malyshev
6e12e49b5b
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
More string length checks & fixes
2016-11-03 20:46:25 -07:00
Stanislav Malyshev
ea9fac94bb
More string length checks & fixes
2016-11-03 20:36:52 -07:00
Derick Rethans
7f2b7a4950
Updated to version 2016.9 (2016i)
2016-11-03 13:57:31 -04:00
Derick Rethans
ccb91cde94
Updated to version 2016.9 (2016i)
2016-11-03 13:57:28 -04:00
Anatol Belski
de643586de
Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
...
(cherry picked from commit 99b242a6d0
)
2016-11-03 17:09:03 +01:00
Anatol Belski
99b242a6d0
Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
2016-11-03 17:03:23 +01:00
Xinchen Hui
1efb9fd32d
Fixed bug #73423 (Reproducible crash with GDB backtrace)
2016-11-02 12:11:30 +08:00
Christoph M. Becker
8957ff36b3
Merge branch 'PHP-5.6' into PHP-7.0
2016-11-01 20:24:10 +01:00
Christoph M. Becker
2eacb53fc4
Fix #73436 : Setting allow_url_fopen to Off makes several tests fail
...
We make sure that these tests run with allow_url_fopen=1.
2016-11-01 20:13:53 +01:00
Christoph M. Becker
5693474997
Fix #72696 : imagefilltoborder stackoverflow on truecolor images
...
We must not allow negative color values be passed to
gdImageFillToBorder(), because that can lead to infinite recursion
since the recursion termination condition will not necessarily be met.
(cherry picked from commit 863d37ea66
)
2016-11-01 13:07:37 +01:00
Christoph M. Becker
1b5543b8ab
Fix #72482 : Ilegal write/read access caused by gdImageAALine overflow
...
Instead of rolling our own bounds check we use clip_1d() as it's done
in gdImageLine() and in external libgd. We must not pass the image
width and height, respectively, but rather the largest ordinate value
that is allowed to be accessed, i.e. width-1 and height-1,
respectively.
(cherry picked from commit 6499581af7
)
2016-11-01 13:03:41 +01:00
Stanislav Malyshev
7cf7920055
Fix bug #73144 and bug #73341 - remove extra dtor
...
(cherry picked from commit f74d7d92c8
)
Conflicts:
ext/spl/spl_array.c
Merged the test only, in 7.0 tree the removed dtor call is already
not present.
2016-11-01 13:01:58 +01:00
Anatol Belski
6b21c28b0e
remove unreferenced var came in with merge
2016-11-01 12:55:05 +01:00
Stanislav Malyshev
8c67460a10
Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
...
Proper soltion would be to call serialize/unserialize and deal with the result,
but this requires more work that should be done by wddx maintainer (not me).
(cherry picked from commit 6045de69c7
)
Conflicts:
ext/wddx/wddx.c
2016-11-01 12:50:33 +01:00
Christoph M. Becker
863d37ea66
Fix #72696 : imagefilltoborder stackoverflow on truecolor images
...
We must not allow negative color values be passed to
gdImageFillToBorder(), because that can lead to infinite recursion
since the recursion termination condition will not necessarily be met.
2016-10-30 14:31:29 -07:00
Christoph M. Becker
6499581af7
Fix #72482 : Ilegal write/read access caused by gdImageAALine overflow
...
Instead of rolling our own bounds check we use clip_1d() as it's done
in gdImageLine() and in external libgd. We must not pass the image
width and height, respectively, but rather the largest ordinate value
that is allowed to be accessed, i.e. width-1 and height-1,
respectively.
2016-10-30 14:28:23 -07:00
Xinchen Hui
af873d4788
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #73402 (Opcache segfault when using class constant to call a method)
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
2016-10-29 23:43:59 +08:00
Xinchen Hui
ef75ddd4f9
Fixed bug #73402 (Opcache segfault when using class constant to call a method)
2016-10-29 23:41:51 +08:00
Xinchen Hui
66caa61188
Skip if no jit is built
2016-10-29 14:23:25 +08:00
Xinchen Hui
e5aa365147
Fixed bug #73392 (A use-after-free in zend allocator management)
2016-10-28 21:21:24 +08:00
Anatol Belski
0f9a4af90b
make config.w32 compatible with ICU 58
2016-10-26 13:05:03 +02:00
Christoph M. Becker
af4bfe234c
Merge branch 'PHP-5.6' into PHP-7.0
2016-10-25 14:31:41 +02:00
Christoph M. Becker
cd13d0260a
Fix #72494 : imagecropauto out-of-bounds access
...
This issue has actually already been fixed with commit 46f2c690. We're
adding a regression test and a NEWS entry, and also port the fix in
gdImageCropThreshold() from libgd:
* <https://github.com/libgd/libgd/commit/b347e034 >
* <https://github.com/libgd/libgd/commit/46f2c690 >
2016-10-25 14:29:48 +02:00
Derick Rethans
7544040469
Updated to version 2016.8 (2016h)
2016-10-24 10:37:13 +01:00
Derick Rethans
4f5a755b9d
Updated to version 2016.8 (2016h)
2016-10-24 10:37:07 +01:00
Stanislav Malyshev
f74d7d92c8
Fix bug #73144 and bug #73341 - remove extra dtor
2016-10-23 22:03:16 -07:00
Stanislav Malyshev
6045de69c7
Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
...
Proper soltion would be to call serialize/unserialize and deal with the result,
but this requires more work that should be done by wddx maintainer (not me).
2016-10-23 20:09:23 -07:00
Nikita Popov
89d3e234af
Fix test output
...
Changed due to eca84946a4
.
2016-10-23 22:26:25 +02:00
Adam Saponara
55d17662cb
Fix bug #71241 : array_replace_recursive mutates ref params
...
`array_replace_recursive` can sometimes mutate its params if
references are nested within. This differs from the PHP 5 behavior.
2016-10-20 13:22:04 +02:00
Leigh
c3361f16c7
Add php_random_int internal API
...
This is the internal API compliment to `php_random_bytes`
2016-10-20 10:18:07 +01:00
Joe Watkins
295377630a
Merge branch 'pull-request/2152' into PHP-7.0
2016-10-20 05:19:10 +01:00
Joe Watkins
8c74be0c52
Revert "Fix bug #47890 #73215 uniqid() should use better random source"
...
This reverts commit 48f1a17886
.
2016-10-18 11:30:19 +01:00
Yasuo Ohgaki
48f1a17886
Fix bug #47890 #73215 uniqid() should use better random source
2016-10-18 09:13:42 +09:00
Christoph M. Becker
0b596f81b8
Merge branch 'PHP-5.6' into PHP-7.0
...
We also use ZEND_LONG_(MAX|MIN) now instead of LONG_(MAX|MIN).
2016-10-17 23:38:28 +02:00
Christoph M. Becker
86e603a664
Fix #73333 : 2147483647 is fetched as string
...
We return all integers that can be represented as such by PHP as
integers, and only those that exceed the possible range as strings.
On builds which represent integers with 64 bits, the range check is
unnecessary and might cause code checkers to complain, so we skip this
special casing via the preprocessor according to
<http://git.php.net/?p=php-src.git;a=commit;h=99d087e5 >.
2016-10-17 23:34:41 +02:00
Joe Watkins
39ee3184ee
Merge branch 'pull-request/1817'
2016-10-17 17:01:39 +01:00
Joe Watkins
5eb84337a6
Merge branch 'pull-request/1816'
2016-10-17 17:01:28 +01:00