merge the last green changeset on fx-team to m-c
authorTim Taubert <tim.taubert@gmx.de>
Sun, 31 Jul 2011 06:39:34 +0200
changeset 74323 da7801acfbdb5babfbcde6c5ef967ff5731f2d45
parent 74322 499ac3d7582b7ddca5fed1ea3148fad6ae293c21 (current diff)
parent 74317 3efdbc58a094aad6137e5caf93d5cede268b8f40 (diff)
child 74324 f92e021f1f44f0d15b109a47453a7fad5e449f08
push id235
push userbzbarsky@mozilla.com
push dateTue, 27 Sep 2011 17:13:04 +0000
treeherdermozilla-beta@2d1e082d176a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone8.0a1
first release with
nightly linux32
da7801acfbdb / 8.0a1 / 20110731030821 / files
nightly linux64
da7801acfbdb / 8.0a1 / 20110731030821 / files
nightly mac
da7801acfbdb / 8.0a1 / 20110731030821 / files
nightly win32
da7801acfbdb / 8.0a1 / 20110731030821 / files
nightly win64
da7801acfbdb / 8.0a1 / 20110731030821 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
merge the last green changeset on fx-team to m-c
--- a/dom/base/nsJSEnvironment.cpp
+++ b/dom/base/nsJSEnvironment.cpp
@@ -1618,16 +1618,18 @@ nsJSContext::ExecuteScript(void *aScript
   JSAutoRequest ar(mContext);
   ++mExecuteDepth;
   ok = ::JS_ExecuteScript(mContext, (JSObject *)aScopeObject, scriptObj, &val);
 
   if (ok) {
     // If all went well, convert val to a string (XXXbe unless undefined?).
     rv = JSValueToAString(mContext, val, aRetValue, aIsUndefined);
   } else {
+    ReportPendingException();
+
     if (aIsUndefined) {
       *aIsUndefined = PR_TRUE;
     }
 
     if (aRetValue) {
       aRetValue->Truncate();
     }
   }