Fix infinite loop when calling an undefined function.

CHANGELOG.md

@@ -4,6 +4,10 @@ Changelog
 master (unreleased)
 -------------------
 
+* Fix error propagation. Thanks Tom Delmas. Merge of
+  [#534](https://github.com/mozilla/nunjucks/pull/534).
+
+
 v2.1.0 (Sep 21 2015)
 --------------------
 

src/environment.js

@@ -509,8 +509,12 @@ Template = Obj.extend({
                             context,
                             frame,
                             runtime,
-                            function() {
-                                cb(null, context.getExported());
+                            function(err) {
+        		        if ( err ) {
+        			    cb(err, null);
+        		        } else {
+        			    cb(null, context.getExported());
+        		        }
                             });
     },
 

tests/compiler.js

@@ -1125,5 +1125,34 @@
                   'may the forth be with you');
             finish(done);
         });
+
+        it('should throw an error when including a file that calls an undefined macro', function(done) {
+            render(
+                '{% include "undefined-macro.html" %}',
+                {},
+                { noThrow: true },
+                function(err, res) {
+                    expect(res).to.be(undefined);
+                    expect(err).to.match(/Unable to call `\w+`, which is undefined or falsey/);
+                }
+            );
+
+            finish(done);
+        });
+
+        it('should throw an error when including a file that imports macro that calls an undefined macro', function(done) {
+            render(
+                '{% include "import-macro-call-undefined-macro.html" %}',
+                { 'list' : [1, 2, 3] },
+                { noThrow: true },
+                function(err, res) {
+                    expect(res).to.be(undefined);
+                    expect(err).to.match(/Unable to call `\w+`, which is undefined or falsey/);
+                }
+            );
+
+            finish(done);
+        });
+
     });
 })();

tests/templates/import-macro-call-undefined-macro.html

@@ -0,0 +1,4 @@
+{% import 'macro-call-undefined-macro.html' as t %}
+{% for el in list %}
+	{{ t.defined_macro() }}
+{% endfor %}

tests/templates/macro-call-undefined-macro.html

@@ -0,0 +1,3 @@
+{% macro defined_macro(useless) %}
+	{% include "undefined-macro.html" %}
+{% endmacro %}

tests/templates/undefined-macro.html

@@ -0,0 +1 @@
+{{ undef() }}