com php-src: ZVAL_STRINGL takes only three variables : ext/openssl/openssl.c ext/standard/scanf.c
| From: | Lior Kaplan | Date: | Tue, 22 Jul 2014 16:38:35 +0000 |
| Subject: | com php-src: ZVAL_STRINGL takes only three variables : ext/openssl/openssl.c ext/standard/scanf.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79554@lists.php.net to get a copy of this message | ||
Commit: ca273c31dd893f8f2520b82c7359dac8424cd67d
Author: Lior Kaplan <kaplanlior@gmail.com> Tue, 22 Jul 2014 14:13:12 +0300
Parents: 2334785f98a0a7270e07b4b66d21f6d0191e9bf5
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ca273c31dd893f8f2520b82c7359dac8424cd67d
Log:
ZVAL_STRINGL takes only three variables
Follow up for commit f4cfaf36
Changed paths:
M ext/openssl/openssl.c
M ext/standard/scanf.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index ed13bae..b0b23fe 100755
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -4867,7 +4867,7 @@ PHP_FUNCTION(openssl_seal)
zval_dtor(*ivec);
if (ivlen) {
iv[ivlen] = '\0';
- ZVAL_STRINGL(*ivec, erealloc(iv, ivlen + 1), ivlen, 0);
+ ZVAL_STRINGL(*ivec, erealloc(iv, ivlen + 1), ivlen);
} else {
ZVAL_EMPTY_STRING(*ivec);
}
diff --git a/ext/standard/scanf.c b/ext/standard/scanf.c
index ef3fe29..f5f9716 100644
--- a/ext/standard/scanf.c
+++ b/ext/standard/scanf.c
@@ -925,7 +925,7 @@ literal:
__buf[1] = '\0';;
current = args[objIndex++];
zval_dtor(*current);
- ZVAL_STRINGL( *current, __buf, 1, 1);
+ ZVAL_STRINGL( *current, __buf, 1);
} else {
add_index_stringl(return_value, objIndex++, &sch, 1);
}