php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-27 01:32:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pull-request/2798' into PHP-7.0

Browse Source 
* pull-request/2798:
  Fix Bug #75299 Wrong reflection on inflate_init and inflate_add
This commit is contained in:
Christoph M. Becker
2017-10-11 17:05:53 +02:00
parent b497b6edf9 9d9873b3b5
commit 787bf7eaf7
3 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
NEWS
View File

@@ -4,7 +4,11 @@ PHP NEWS
- Exif:
. Fixed bug #75301 (Exif extension has built in revision version). (Peter
Kokot).
Kokot)
- Zlib:
. Fixed bug #75299 (Wrong reflection on inflate_init and inflate_add). (Fabien
Villepinte)
26 Oct 2017 PHP 7.0.25

20
ext/zlib/tests/bug75299.phpt Normal file
View File

@@ -0,0 +1,20 @@
--TEST--
Bug #75299 Wrong reflection on inflate_init and inflate_add
--SKIPIF--
<?php if (!extension_loaded("zlib") || !extension_loaded('reflection')) die("skip"); ?>
--FILE--
<?php
$r = new ReflectionFunction('inflate_init');
var_dump($r->getNumberOfRequiredParameters());
var_dump($r->getNumberOfParameters());
$r = new ReflectionFunction('inflate_add');
var_dump($r->getNumberOfRequiredParameters());
var_dump($r->getNumberOfParameters());
?>
===DONE===
--EXPECT--
int(1)
int(2)
int(2)
int(3)
===DONE===

6
ext/zlib/zlib.c
View File

@@ -1315,11 +1315,13 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_inflate_init, 0, 0, 1)
ZEND_ARG_INFO(0, encoding)
ZEND_ARG_INFO(0, options)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_inflate_add, 0, 0, 2)
ZEND_ARG_INFO(0, resource)
ZEND_ARG_INFO(0, flush_behavior)
ZEND_ARG_INFO(0, context)
ZEND_ARG_INFO(0, encoded_data)
ZEND_ARG_INFO(0, flush_mode)
ZEND_END_ARG_INFO()
/* }}} */