Merge pull request #471 from finnsoft/master

Fixed: don't throw errors on accessing property of null object
paularmstrong · Jun 27, 2014 · 8475519 · 8475519
2 parents 9b75436 + 0eaf9b8
commit 8475519
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/parser.js b/lib/parser.js
@@ -399,12 +399,12 @@ TokenParser.prototype = {
         m = match,
         build = '';
 
-      build = '(typeof ' + c + ' !== "undefined"';
+      build = '(typeof ' + c + ' !== "undefined" && ' + c + ' !== null';
       utils.each(m, function (v, i) {
         if (i === 0) {
           return;
         }
-        build += ' && ' + c + '.' + v + ' !== undefined';
+        build += ' && ' + c + '.' + v + ' !== undefined && ' + c + '.' + v + ' !== null';
         c += '.' + v;
       });
       build += ')';

diff --git a/tests/basic.test.js b/tests/basic.test.js
@@ -160,6 +160,13 @@ describe('options', function () {
         .to.throwError();
     });
   });
+
+  describe('null object', function () {
+    it('can skip null object', function () {
+      expect(swig.render('{{ a.property }}', { locals: { a: null }})).to.equal('');
+    });
+  });
+
 });
 
 describe('separate instances', function () {