SERVER-1749 catch exception in get next callback

1 files changed, 12 insertions, 8 deletions

diff --git a/scripting/v8_db.cpp b/scripting/v8_db.cpp
index e1788755042..2ccca1c7c0c 100644
--- a/scripting/v8_db.cpp
+++ b/scripting/v8_db.cpp
@@ -367,15 +367,19 @@ namespace mongo {
     }
 
     v8::Handle<v8::Value> internalCursorNext(const v8::Arguments& args){    
-        mongo::DBClientCursor * cursor = getCursor( args );
-        if ( ! cursor )
-            return v8::Undefined();
-        BSONObj o;
-        {
-            v8::Unlocker u;
-            o = cursor->next();
+        try {
+            mongo::DBClientCursor * cursor = getCursor( args );
+            if ( ! cursor )
+                return v8::Undefined();
+            BSONObj o;
+            {
+                v8::Unlocker u;
+                o = cursor->next();
+            }
+            return mongoToV8( o );
+        } catch ( ... ) {
+            return v8::ThrowException( v8::String::New( "unexpected exception in internalCursorNext()" ) );
         }
-        return mongoToV8( o );
     }
 
     v8::Handle<v8::Value> internalCursorHasNext(const v8::Arguments& args){