1 files changed, 8 insertions, 0 deletions
diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index 9b1a3d709..e703b4c13 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -229,6 +229,14 @@ ReportError(JSContext* cx, const char* message, JSErrorReport* reportp,
         if (js_ErrorToException(cx, message, reportp, callback, userRef)) {
             return;
         }
+
+        /*
+         * The AutoJSAPI error reporter only allows warnings to be reported so
+         * just ignore this error rather than try to report it.
+         */
+        if (cx->options().autoJSAPIOwnsErrorReporting() && !JSREPORT_IS_WARNING(reportp->flags))
+            return;
+
     }
 
     /*