com php-src: fix memory leak in php_mb_check_encoding: ext/mbstring/mbstring.c
| From: | Yasuo Ohgaki | Date: | Sat, 07 Mar 2015 17:03:46 +0000 |
| Subject: | com php-src: fix memory leak in php_mb_check_encoding: ext/mbstring/mbstring.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93705@lists.php.net to get a copy of this message | ||
Commit: 84100270fb2167a749bfce75b13a24d31eb5eb39
Author: Masaki Kagaya <masakielastic@gmail.com> Sat, 21 Feb 2015 23:39:59 +0900
Parents: bdb7a59a4b4902a2baaf82531430672ee5ca3927
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=84100270fb2167a749bfce75b13a24d31eb5eb39
Log:
fix memory leak in php_mb_check_encoding
Changed paths:
M ext/mbstring/mbstring.c
Diff:
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 1ca53b6..a6fedd3 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -4560,6 +4560,7 @@ static inline int php_mb_check_encoding(const char *input, size_t length,
const
if (ret != NULL) {
if (illegalchars == 0 && string.len == result.len && memcmp(string.val,
result.val, string.len) == 0) {
+ mbfl_string_clear(&result);
return 1;
}