Merge pull request #1951 from alubbe/fix-memory-leak

fixed memory leak caused by compileDebug flag
pugjs · May 18, 2015 · f2a1882 · f2a1882
2 parents 8a7c718 + 23fe2df
commit f2a1882
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/lib/compiler.js b/lib/compiler.js
@@ -195,11 +195,11 @@ Compiler.prototype = {
     var debug = this.debug;
 
     if (debug) {
-      this.buf.push('jade_debug.unshift({ lineno: ' + node.line
-        + ', filename: ' + (node.filename
+      this.buf.push('jade_debug.unshift(new jade.DebugItem( ' + node.line
+        + ', ' + (node.filename
           ? utils.stringify(node.filename)
           : 'jade_debug[0].filename')
-        + ' });');
+        + ' ));');
     }
 
     // Massive hack to fix our context

diff --git a/lib/index.js b/lib/index.js
@@ -205,7 +205,7 @@ exports.compile = function(str, options){
   var parsed = parse(str, options);
   if (options.compileDebug !== false) {
     fn = [
-        'var jade_debug = [{ lineno: 1, filename: ' + filename + ' }];'
+        'var jade_debug = [ new jade.DebugItem( 1, ' + filename + ' ) ];'
       , 'try {'
       , parsed.body
       , '} catch (err) {'
@@ -256,7 +256,7 @@ exports.compileClientWithDependenciesTracked = function(str, options){
   var parsed = parse(str, options);
   if (options.compileDebug) {
     fn = [
-        'var jade_debug = [{ lineno: 1, filename: ' + filename + ' }];'
+        'var jade_debug = [ new jade.DebugItem( 1, ' + filename + ' ) ];'
       , 'try {'
       , parsed.body
       , '} catch (err) {'

diff --git a/lib/runtime.js b/lib/runtime.js
@@ -230,3 +230,8 @@ exports.rethrow = function rethrow(err, filename, lineno, str){
     + '\n' + context + '\n\n' + err.message;
   throw err;
 };
+
+exports.DebugItem = function DebugItem(lineno, filename) {
+  this.lineno = lineno;
+  this.filename = filename;
+}
diff --git a/test/unit.js b/test/unit.js
@@ -1,6 +1,7 @@
 
 var runtime = require('../lib/runtime')
-  , merge = runtime.merge;
+  , merge = runtime.merge
+  , DebugItem = runtime.DebugItem;
 
 describe('merge(a, b, escaped)', function(){
   it('should merge classes into strings', function(){
@@ -37,4 +38,11 @@ describe('merge(a, b, escaped)', function(){
     merge({ class: ['foo', null, 'bar'] }, { class: [undefined, null, 0, 'baz'] })
       .should.eql({ class: ['foo', 'bar', 0, 'baz'] });
   })
-})
+})
+
+describe('DebugItem', function(){
+  it('should instantiate objects with lineno and filename properties', function(){
+    new DebugItem(42, "/path/to/file")
+      .should.eql({ lineno: 42, filename: "/path/to/file" });
+  })
+})