archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.1' into PHP-7.2

Browse source 
* PHP-7.1:
  Fix Bug #75299 Wrong reflection on inflate_init and inflate_add
This commit is contained in:
Christoph M. Becker 2017-10-11 17:30:17 +02:00
commit 1f150fcde1
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)
12 Oct 2017, PHP 7.2.0RC4

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

@ -1366,11 +1366,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()
ZEND_BEGIN_ARG_INFO_EX(arginfo_inflate_get_status, 0, 0, 1)