diff options
| author | Will Fitch <willfitch@php.net> | 2014-01-18 11:39:32 -0500 |
|---|---|---|
| committer | Will Fitch <willfitch@php.net> | 2014-01-18 11:39:32 -0500 |
| commit | 767e6d2e08afad2ac5e019b08a8875ffd2496206 (patch) | |
| tree | f9f404591e3c419f000b084ed5f7a5aa92ad2427 | |
| parent | 7f0aff52cf35db89c1285ddb931fc118e1127561 (diff) | |
| parent | 5b906ce6eb02118697c2f81d462ddfa724377fe8 (diff) | |
| download | php-git-767e6d2e08afad2ac5e019b08a8875ffd2496206.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #66509: copy() arginfo incorrect since 5.4
Conflicts:
NEWS
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 2 | ||||
| -rw-r--r-- | ext/standard/tests/file/bug66509.phpt | 15 |
3 files changed, 19 insertions, 1 deletions
@@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2014, PHP 5.5.9 +- Core: + . Fixed bug #66509 (copy() arginfo has changed starting from 5.4). (willfitch) + - GD: . Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop()). (Laruence, Remi) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 819e0a3bbc..e22725bdb0 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1214,7 +1214,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_fstat, 0) ZEND_ARG_INFO(0, fp) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_copy, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_copy, 0, 0, 2) ZEND_ARG_INFO(0, source_file) ZEND_ARG_INFO(0, destination_file) ZEND_ARG_INFO(0, context) diff --git a/ext/standard/tests/file/bug66509.phpt b/ext/standard/tests/file/bug66509.phpt new file mode 100644 index 0000000000..0e414f2321 --- /dev/null +++ b/ext/standard/tests/file/bug66509.phpt @@ -0,0 +1,15 @@ +--TEST-- +Bug #66509 (copy() showing $context parameter as required) +--FILE-- +<?php + +$r = new \ReflectionFunction('copy'); + +foreach($r->getParameters() as $p) { + var_dump($p->isOptional()); +} +?> +--EXPECT-- +bool(false) +bool(false) +bool(true) |