com php-src: Fixed memory leak: Zend/zend_language_scanner .l
| From: | Dmitry Stogov | Date: | Tue, 19 Feb 2019 16:21:36 +0000 |
| Subject: | com php-src: Fixed memory leak: Zend/zend_language_scanner .l | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-104746@lists.php.net to get a copy of this message | ||
Commit: 723acab660081c2e8c023c34c0fadb088eb13244
Author: Dmitry Stogov <dmitry@zend.com> Tue, 19 Feb 2019 19:21:36 +0300
Parents: 002c096871ff428a3832046aeaf9204446549b6c
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=723acab660081c2e8c023c34c0fadb088eb13244
Log:
Fixed memory leak
Changed paths:
M Zend/zend_language_scanner.l
Diff:
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 9365e68..e93431d 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -2215,10 +2215,16 @@ skip_escape_conversion:
if (SCNG(output_filter)) {
size_t sz = 0;
char *str = NULL;
+ zend_string *new_str;
s = Z_STRVAL_P(zendlval);
// TODO: avoid reallocation ???
SCNG(output_filter)((unsigned char **)&str, &sz, (unsigned char *)s,
(size_t)Z_STRLEN_P(zendlval));
- ZVAL_STRINGL(zendlval, str, sz);
+ new_str = zend_string_init(str, sz, 0);
+ if (str != s) {
+ efree(str);
+ }
+ zend_string_release_ex(Z_STR_P(zendlval), 0);
+ ZVAL_STR(zendlval, new_str);
}
RETURN_TOKEN_WITH_VAL(T_CONSTANT_ENCAPSED_STRING);
}