com php-src: Fix one more leak when wrong $needle type provide of strripos: ext/standard/string.c ext/standard/tests/strings/strripos.phpt
| From: | Xinchen Hui | Date: | Fri, 23 Jan 2015 09:14:39 +0000 |
| Subject: | com php-src: Fix one more leak when wrong $needle type provide of strripos: ext/standard/string.c ext/standard/tests/strings/strripos.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84341@lists.php.net to get a copy of this message | ||
Commit: bdfe4d65584299fe5726fe4735d5b37d1359f66e
Author: Reeze Xia <reeze@php.net> Fri, 23 Jan 2015 17:14:39 +0800
Parents: d44b6e58ba1c1cae6758159abe9b0b78e2ec09c0
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bdfe4d65584299fe5726fe4735d5b37d1359f66e
Log:
Fix one more leak when wrong $needle type provide of strripos
Changed paths:
M ext/standard/string.c
M ext/standard/tests/strings/strripos.phpt
Diff:
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 4f0a6ec..d6c2a6c 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2114,6 +2114,7 @@ PHP_FUNCTION(strripos)
needle = Z_STR_P(zneedle);
} else {
if (php_needle_char(zneedle, ord_needle->val) != SUCCESS) {
+ STR_ALLOCA_FREE(ord_needle, use_heap);
RETURN_FALSE;
}
ord_needle->val[1] = '\0';
diff --git a/ext/standard/tests/strings/strripos.phpt b/ext/standard/tests/strings/strripos.phpt
index eb4e70b..924505f 100644
--- a/ext/standard/tests/strings/strripos.phpt
+++ b/ext/standard/tests/strings/strripos.phpt
@@ -15,6 +15,9 @@ strripos() function
var_dump(@strripos("a", ""));
var_dump(@strripos("", "a"));
var_dump(@strripos("\\\\a", "\\a"));
+
+ $fp = fopen(__FILE__, "r");
+ var_dump(@strripos("", $fp));
?>
--EXPECT--
int(5)
@@ -30,4 +33,5 @@ bool(false)
bool(false)
bool(false)
int(1)
+bool(false)