Merge branch 'PHP-7.4'

nikic · nikic · commit 4276d669d23c · 2019-08-09T15:02:57.000+02:00
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -7012,7 +7012,7 @@ PHP_FUNCTION(openssl_random_pseudo_bytes)
 	zend_long buffer_length;
 	zval *zstrong_result_returned = NULL;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|z/", &buffer_length, &zstrong_result_returned) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|z", &buffer_length, &zstrong_result_returned) == FAILURE) {
 		return;
 	}
 
diff --git a/ext/openssl/tests/bug78391.phpt b/ext/openssl/tests/bug78391.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Bug #78391: Assertion failure in openssl_random_pseudo_bytes
+--FILE--
+<?php
+
+$isStrongCrypto = false;
+var_dump(strlen(openssl_random_pseudo_bytes(16, $isStrongCrypto)));
+var_dump($isStrongCrypto);
+
+?>
+--EXPECT--
+int(16)
+bool(true)

Original file line number	Diff line number	Diff line change
`@@ -7012,7 +7012,7 @@ PHP_FUNCTION(openssl_random_pseudo_bytes)`
`7012`	`7012`	`zend_long buffer_length;`
`7013`	`7013`	`zval *zstrong_result_returned = NULL;`
`7014`	`7014`
`7015`		`- if (zend_parse_parameters(ZEND_NUM_ARGS(), "l\|z/", &buffer_length, &zstrong_result_returned) == FAILURE) {`
	`7015`	`+ if (zend_parse_parameters(ZEND_NUM_ARGS(), "l\|z", &buffer_length, &zstrong_result_returned) == FAILURE) {`
`7016`	`7016`	`return;`
`7017`	`7017`	`}`
`7018`	`7018`