Merge pull request #843 from atian25/escape-null

fix: undefined escape at #836
mozilla · Sep 13, 2016 · 7671d29 · 7671d29
2 parents bee67d5 + dd51fb5
commit 7671d29
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/src/filters.js b/src/filters.js
@@ -119,10 +119,12 @@ var filters = {
         if(str instanceof r.SafeString) {
             return str;
         }
+        str = (str === null || str === undefined) ? '' : str;
         return r.markSafe(lib.escape(str.toString()));
     },
 
     safe: function(str) {
+        str = (str === null || str === undefined) ? '' : str;
         return r.markSafe(str);
     },
 

diff --git a/tests/compiler.js b/tests/compiler.js
@@ -1309,10 +1309,22 @@
                 expect(res).to.be('&><\'"');
             });
 
+            render('{{ foo }}', { foo: null }, { autoescape: true }, function (err, res) {
+                expect(res).to.be('');
+            });
+
+            render('{{ foo | safe }}', { foo: null }, { autoescape: true }, function (err, res) {
+                expect(res).to.be('');
+            });
+
             render('{{ foo }}', { foo: ['<p>foo</p>']}, { autoescape: true }, function(err, res) {
                 expect(res).to.be('&lt;p&gt;foo&lt;/p&gt;');
             });
 
+            render('{{ foo | safe }}', { foo: '<p>foo</p>' }, { autoescape: true }, function (err, res) {
+                expect(res).to.be('<p>foo</p>');
+            });
+
             render('{{ foo }}', { foo: {toString: function() {return '<p>foo</p>'}}}, { autoescape: true }, function(err, res) {
                 expect(res).to.be('&lt;p&gt;foo&lt;/p&gt;');
             });

diff --git a/tests/filters.js b/tests/filters.js
@@ -116,6 +116,10 @@
 
             var res2 = render('{{ foo | escape }}', {foo: {toString: function() { return '<html>'; }}}, { autoescape: false });
             expect(res2).to.be('&lt;html&gt;');
+
+            var res3 = render('{{ foo | escape }}', { foo: null }, { autoescape: false });
+            expect(res3).to.be('');
+
             finish(done);
         });