From 94442082446e97f8f7edd4c0b4b22e27a9bf9a5a Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Wed, 9 Mar 2016 22:27:13 -0500
Subject: [PATCH] Bug 1112920 - Assert against pending exceptions in
 AutoJSAPI::InitInternal. v1 r=luke,r=smaug

---
 dom/base/ScriptSettings.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dom/base/ScriptSettings.cpp b/dom/base/ScriptSettings.cpp
index 11ff84649155..f1446dfb5e96 100644
--- a/dom/base/ScriptSettings.cpp
+++ b/dom/base/ScriptSettings.cpp
@@ -334,6 +334,7 @@ AutoJSAPI::InitInternal(JSObject* aGlobal, JSContext* aCx, bool aIsMainThread)
 {
   MOZ_ASSERT(aCx);
   MOZ_ASSERT(aIsMainThread == NS_IsMainThread());
+  MOZ_ASSERT(!JS_IsExceptionPending(mCx));
 
   mCx = aCx;
   mIsMainThread = aIsMainThread;