Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/main/java/com/hubspot/jinjava/util/EagerContextWatcher.java
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,7 @@ private static Map<String, String> getInitiallyResolvedAsStrings(
? entrySet
: interpreter.getContext().getCombinedScope().entrySet()).stream()
.filter(entry -> initiallyResolvedHashes.containsKey(entry.getKey()))
.filter(entry ->
EagerExpressionResolver.isResolvableObject(entry.getValue(), 4, 400) // TODO make this configurable
.filter(entry -> isResolvableForContextReverting(entry.getValue()) // TODO make this configurable
);
entryStream.forEach(entry ->
cacheRevertibleObject(
Expand Down Expand Up @@ -392,15 +391,19 @@ private static Object getObjectOrHashCode(Object o) {
o = ((LazyExpression) o).get();
}

if (o instanceof PyList && !((PyList) o).toList().contains(o)) {
if (o instanceof PyList && isResolvableForContextReverting(o)) {
return o.hashCode();
}
if (o instanceof PyMap && !((PyMap) o).toMap().containsValue(o)) {
if (o instanceof PyMap && isResolvableForContextReverting(o)) {
return o.hashCode() + ((PyMap) o).keySet().hashCode();
}
return o;
}

private static boolean isResolvableForContextReverting(Object o) {
return EagerExpressionResolver.isResolvableObject(o, 4, 400);
}

public static class EagerChildContextConfig {

private final boolean takeNewValue;
Expand Down
7 changes: 7 additions & 0 deletions src/test/java/com/hubspot/jinjava/EagerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -1741,6 +1741,13 @@ public void itHandlesModifiedIncludePathSecondPass() {
);
}

@Test
public void itDoesNotStackOverflowTryingToBuildHashcode() {
expectedTemplateInterpreter.assertExpectedOutput(
"does-not-stack-overflow-trying-to-build-hashcode/test"
);
}

@Test
public void itHandlesDeferredValueInRenderFilter() {
expectedTemplateInterpreter.assertExpectedOutput(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% for i in deferred %}
hey
{% endfor %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{% set l1000_1 = [] %}
{% set l1000_2 = [] %}
{% set l1000_3 = [] %}

{% do l1000_1.append(l1000_2) %}
{% do l1000_2.append(l1000_3) %}
{% do l1000_3.append(l1000_1) %}


{% for i in deferred %}
{{ 'hey' }}
{% endfor %}