fixed infinite callstack issue in 0.10.0, but stack size limiting not working yet

Author: mattinsler

index.js

@@ -58,25 +58,23 @@ var create_callsite = function(location) {
 };
 
 Error.prepareStackTrace = function(error, structured_stack_trace) {
-  console.log('Error.prepareStackTrace');
-  console.log(arguments);
   error.__cached_trace__ = structured_stack_trace.filter(function(f) {
-    console.log(f);
     return f.getFileName() !== filename;
   });
 
-  if (!error.__previous__ && current_trace_error) {
+  if (!error.__previous__ && current_trace_error && current_trace_error !== error) {
     error.__previous__ = current_trace_error;
   }
 
   ++in_prepare;
   var previous_trace = error.__previous__ ? error.__previous__.stack : null;
   --in_prepare;
+  
   if (previous_trace) {
     error.__cached_trace__.push(create_callsite(exports.empty_frame));
     Array.prototype.push.apply(error.__cached_trace__, previous_trace);
   }
-
+  
   if (in_prepare > 0) { return error.__cached_trace__; }
   return exports.format_stack(error, error.__cached_trace__);
 };

test/test-longjohn.js

@@ -21,7 +21,8 @@ describe('longjohn', function() {
 
   it('should track frames across setTimeout', function(done) {
     setTimeout(function() {
-      console.log(new Error('foobar').stack);
+      assert.equal(new Error('foobar').stack.split(longjohn.empty_frame).length, 2);
+      done();
     }, 1);
   });
 
@@ -32,15 +33,7 @@ describe('longjohn', function() {
 
     var foo = function() {
       if (++counter > 3) {
-        assert.throws(function() {
-          try {
-            throw new Error('foo');
-          } catch (e) {
-            throw e;
-          }
-        }, function(err) {
-          return err.stack.split(longjohn.empty_frame).length === 3;
-        });
+        assert.equal(new Error('foo').stack.split(longjohn.empty_frame).length, 3);
         return done();
       }
       setTimeout(foo, 1);
@@ -90,13 +83,14 @@ describe('longjohn', function() {
     setTimeout(function() {
       assert.deepEqual(Array.prototype.slice.call(arguments), [1, 2, 3]);
       done();
-    }, 1000, 1, 2, 3);
+    }, 1, 1, 2, 3);
   });
 
   it('should work with setInterval', function(done) {
-    setInterval(function() {
+    var interval_id = setInterval(function() {
       assert.deepEqual(Array.prototype.slice.call(arguments), [1, 2, 3]);
+      clearInterval(interval_id);
       done();
-    }, 1000, 1, 2, 3);
+    }, 1, 1, 2, 3);
   });
 });