Merge pull request #368 from peakji/master

Close db with open iterator should not crash

src/iterator.cc

@@ -214,13 +214,13 @@ bool Iterator::IteratorNext (std::vector<std::pair<std::string, std::string> >&
 
     if (ok) {
       result.push_back(std::make_pair(key, value));
-      size = size + key.size() + value.size();
 
       if (!landed) {
         landed = true;
         return true;
       }
 
+      size = size + key.size() + value.size();
       if (size > highWaterMark)
         return true;
 
@@ -329,6 +329,10 @@ NAN_METHOD(Iterator::Next) {
 
   v8::Local<v8::Function> callback = info[0].As<v8::Function>();
 
+  if (iterator->ended) {
+    LD_RETURN_CALLBACK_OR_ERROR(callback, "iterator has ended");
+  }
+
   NextWorker* worker = new NextWorker(
       iterator
     , new Nan::Callback(callback)

test/iterator-test.js

@@ -128,7 +128,7 @@ make('iterator optimized for seek', function (db, t, done) {
             t.error(err, 'no error from next()')
             t.equal(key.toString(), 'e', 'key matches')
             t.ok(ite.cache.length > 0, "has cached items")
-            done();
+            ite.end(done)
           })
         })
       })
@@ -139,8 +139,8 @@ make('iterator optimized for seek', function (db, t, done) {
 make('iterator seek before next has completed', function (db, t, done) {
   var ite = db.iterator()
   ite.next(function (err, key, value) {
-    t.error(err, 'no error from end()')
-    done()
+    t.error(err, 'no error from next()')
+    ite.end(done)
   })
   var error
   try {
@@ -152,6 +152,24 @@ make('iterator seek before next has completed', function (db, t, done) {
   t.ok(error, 'had error from seek() before next() has completed')
 })
 
+make('close db with open iterator', function (db, t, done) {
+  var ite = db.iterator()
+  var cnt = 0
+  ite.next(function loop(err, key, value) {
+    if(cnt++ === 0)
+      t.error(err, 'no error from next()')
+    else
+      t.equal(err.message, 'iterator has ended')
+    if(key !== undefined)
+      ite.next(loop)
+  })
+
+  db.close(function (err){
+    t.error(err, 'no error from close()')
+    done(false)
+  })
+})
+
 make('iterator seek after end', function (db, t, done) {
   var ite = db.iterator()
   ite.next(function (err, key, value) {