com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/standard/file.c
| From: | Christoph Michael Becker | Date: | Tue, 30 Aug 2016 00:13:48 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: NEWS ext/standard/file.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94144@lists.php.net to get a copy of this message | ||
Commit: 65f0c163f929e48162efc3491fee918bb5c4c280
Author: Christoph M. Becker <cmbecker69@gmx.de> Tue, 30 Aug 2016 02:08:50 +0200
Parents: 4b45c0a9a7d48a69edba9e00270c49bbe17af4d1 207dab585aadd9f320976a0895734d7d9ca7b862
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=65f0c163f929e48162efc3491fee918bb5c4c280
Log:
Merge branch 'PHP-5.6' into PHP-7.0
Changed paths:
MM NEWS
MM ext/standard/file.c
Diff:
diff --cc NEWS
index 4eb5a7d,a05fa84..198af3c
--- a/NEWS
+++ b/NEWS
@@@ -80,18 -48,11 +80,20 @@@ PH
. Fixed bug #72278 (getimagesize returning FALSE on valid jpg). (cmb)
. Fixed bug #65550 (get_browser() incorrectly parses entries with "+" sign).
(cmb)
+ . Fixed bug #71882 (Negative ftruncate() on php://memory exhausts memory).
+ (cmb)
+- Streams:
+ . Fixed bug #72853 (stream_set_blocking doesn't work). (Laruence)
+ . Fixed bug #72764 (ftps:// opendir wrapper data channel encryption fails
+ with IIS FTP 7.5, 8.5). (vhuk)
+
+- Sysvshm:
+ . Fixed bug #72858 (shm_attach null dereference). (Anatol)
+
- XML:
. Fixed bug #72085 (SEGV on unknown address zif_xml_parse). (cmb)
+ . Fixed bug #72714 (_xml_startElementHandler() segmentation fault). (cmb)
- ZIP:
. Fixed bug #68302 (impossible to compile php with zip support). (cmb)
diff --cc ext/standard/file.c
index 5c90b30,d346ed9..e228ce6
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@@ -1546,10 -1512,15 +1546,15 @@@ PHP_NAMED_FUNCTION(php_if_ftruncate
RETURN_FALSE;
}
+ if (size < 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Negative size is not supported");
++ php_error_docref(NULL, E_WARNING, "Negative size is not supported");
+ RETURN_FALSE;
+ }
+
- PHP_STREAM_TO_ZVAL(stream, &fp);
+ PHP_STREAM_TO_ZVAL(stream, fp);
if (!php_stream_truncate_supported(stream)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can't truncate this stream!");
+ php_error_docref(NULL, E_WARNING, "Can't truncate this stream!");
RETURN_FALSE;
}