com php-src: Fix #70395: Missing ARG_INFO for openssl_s eal(): ext/openssl/openssl.c ext/openssl/tests/bug 70395.phpt
| From: | Christoph Michael Becker | Date: | Sat, 05 Sep 2015 01:08:02 +0000 |
| Subject: | com php-src: Fix #70395: Missing ARG_INFO for openssl_s eal(): ext/openssl/openssl.c ext/openssl/tests/bug 70395.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88923@lists.php.net to get a copy of this message | ||
Commit: 43b26c7b21edbc64e197f2b6ae7f0c38a166c9c9
Author: Christoph M. Becker <cmbecker69@gmx.de> Wed, 2 Sep 2015 01:13:49 +0200
Committer: Christoph M. Becker <cmb@php.net> Sat, 5 Sep 2015 03:08:02 +0200
Parents: dc1a8dd7f09af5807aadf3ed5ffc9c443cd9e74c
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=43b26c7b21edbc64e197f2b6ae7f0c38a166c9c9
Log:
Fix #70395: Missing ARG_INFO for openssl_seal()
This patch adds the missing ARG_INFO for the optional 5th parameter $method.
Bugs:
https://bugs.php.net/70395
Changed paths:
M ext/openssl/openssl.c
A ext/openssl/tests/bug70395.phpt
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 0421524..cc86f04 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -348,11 +348,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_verify, 0, 0, 3)
ZEND_ARG_INFO(0, method)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO(arginfo_openssl_seal, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_openssl_seal, 0, 0, 4)
ZEND_ARG_INFO(0, data)
ZEND_ARG_INFO(1, sealdata)
ZEND_ARG_INFO(1, ekeys) /* arary */
ZEND_ARG_INFO(0, pubkeys) /* array */
+ ZEND_ARG_INFO(0, method)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO(arginfo_openssl_open, 0)
diff --git a/ext/openssl/tests/bug70395.phpt b/ext/openssl/tests/bug70395.phpt
new file mode 100644
index 0000000..bfa881a
--- /dev/null
+++ b/ext/openssl/tests/bug70395.phpt
@@ -0,0 +1,19 @@
+--TEST--
+Bug #70395 (Missing ARG_INFO for openssl_seal())
+--SKIPIF--
+<?php
+if (!extension_loaded("openssl")) die("skip openssl not loaded");
+?>
+--FILE--
+<?php
+$func = new ReflectionFunction('openssl_seal');
+$param = $func->getParameters()[4];
+var_dump($param);
+var_dump($param->isOptional());
+?>
+--EXPECTF--
+object(ReflectionParameter)#%d (1) {
+ ["name"]=>
+ string(6) "method"
+}
+bool(true)