getTeminatorAt recurses infinitely if template is its own terminator

R=arv BUG= Review URL: https://codereview.appspot.com/9918043
googlearchive · May 31, 2013 · 5846863 · 5846863
1 parent 8604073
commit 5846863
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/template_element.js b/src/template_element.js
@@ -1269,7 +1269,8 @@
       if (index == -1)
         return this.templateElement_;
       var terminator = this.terminators[index];
-      if (terminator.nodeType !== Node.ELEMENT_NODE)
+      if (terminator.nodeType !== Node.ELEMENT_NODE ||
+          this.templateElement_ === terminator)
         return terminator;
 
       var subIterator = templateIteratorTable.get(terminator);

diff --git a/tests/template_element.js b/tests/template_element.js
@@ -1389,6 +1389,25 @@ suite('Template Element', function() {
     assert.strictEqual('bar', div.childNodes[3].textContent);
   });
 
+  test('Template - Self is terminator', function() {
+    var div = createTestHtml(
+        '<template repeat>{{ foo }}' +
+          '<template bind></template>' +
+        '</template>');
+
+    var m = [{ foo: 'bar' }];
+    recursivelySetTemplateModel(div, m);
+    Platform.performMicrotaskCheckpoint();
+
+    m.push({ foo: 'baz' });
+    recursivelySetTemplateModel(div, m);
+    Platform.performMicrotaskCheckpoint();
+
+    assert.strictEqual(5, div.childNodes.length);
+    assert.strictEqual('bar', div.childNodes[2].textContent);
+    assert.strictEqual('baz', div.childNodes[4].textContent);
+  });
+
   test('ChangeFromBindToRepeat', function() {
     var div = createTestHtml(
         '<template bind="{{a}}">' +