You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by he...@apache.org on 2021/06/17 10:18:26 UTC
[commons-jexl] branch master updated: JEXL-352: restore call to
parser.jjtree.reset() after parse
This is an automated email from the ASF dual-hosted git repository.
henrib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
The following commit(s) were added to refs/heads/master by this push:
new d81b042 JEXL-352: restore call to parser.jjtree.reset() after parse
d81b042 is described below
commit d81b04281cd01b8d656acbda382c856cd57c94b8
Author: henrib <he...@apache.org>
AuthorDate: Thu Jun 17 12:18:17 2021 +0200
JEXL-352: restore call to parser.jjtree.reset() after parse
---
RELEASE-NOTES.txt | 1 +
src/changes/changes.xml | 3 +++
src/main/java/org/apache/commons/jexl3/parser/Parser.jjt | 1 +
3 files changed, 5 insertions(+)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 08c105e..d8a627c 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -30,6 +30,7 @@ Version 3.2.1 is source and binary compatible with 3.2.
Bugs Fixed in 3.2.1:
==================
+* JEXL-352: Possible memory leak regarding parser jjtree nodes in JEXL 3.2
* JEXL-351: JXLT Template fails when using sandboxing
* JEXL-350: map[null] throws "unsolvable property" when a Sandbox is used
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 53b1900..9091e00 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -26,6 +26,9 @@
</properties>
<body>
<release version="3.2.1">
+ <action dev="henrib" type="fix" issue="JEXL-352" due-to="Øyvind Horneland">
+ Possible memory leak regarding parser jjtree nodes in JEXL 3.2
+ </action>
<action dev="henrib" type="fix" issue="JEXL-351" due-to="Francesco Chicchiricco">
JXLT Template fails when using sandboxing
</action>
diff --git a/src/main/java/org/apache/commons/jexl3/parser/Parser.jjt b/src/main/java/org/apache/commons/jexl3/parser/Parser.jjt
index 3014472..a33f7a9 100644
--- a/src/main/java/org/apache/commons/jexl3/parser/Parser.jjt
+++ b/src/main/java/org/apache/commons/jexl3/parser/Parser.jjt
@@ -76,6 +76,7 @@ public final class Parser extends JexlParser
} finally {
token_source.defaultLexState = DEFAULT;
cleanup(previous);
+ jjtree.reset();
}
}
}