fix: m/r emit error gets spidermonkey into bad state SERVER-570

1 files changed, 9 insertions, 1 deletions

diff --git a/scripting/engine_spidermonkey.cpp b/scripting/engine_spidermonkey.cpp
index 2b5e8781fde..2b1493d4629 100644
--- a/scripting/engine_spidermonkey.cpp
+++ b/scripting/engine_spidermonkey.cpp
@@ -827,7 +827,15 @@ namespace mongo {
             
             a = args.obj();
         }
-        BSONObj out = func( a );
+        
+        BSONObj out;
+        try {
+            out = func( a );
+        }
+        catch ( std::exception& e ){
+            JS_ReportError( cx , e.what() );
+            return JS_FALSE;
+        }
         
         if ( out.isEmpty() ){
             *rval = JSVAL_VOID;