Bug 1500822 - Fix a try-note range check in the debugger r=jorendorff
☠☠ backed out by bff46c89a68b ☠ ☠
authorTed Campbell <tcampbell@mozilla.com>
Mon, 22 Oct 2018 18:39:24 +0000
changeset 442434 cb7ced1eb7edea847195a701f2ef000c70d5e8a5
parent 442433 8753dbb0045e86c9a90b04199ec367a5ea3ede28
child 442435 406ca9722ffaa14caf02923c541942725f835d32
push id71490
push usertcampbell@mozilla.com
push dateMon, 22 Oct 2018 20:18:40 +0000
treeherderautoland@cb7ced1eb7ed [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorendorff
bugs1500822
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1500822 - Fix a try-note range check in the debugger r=jorendorff This should symptomless since the extra op should always be a JSOP_GOTO which will be skipped over anyways. Fix for our sanity. Differential Revision: https://phabricator.services.mozilla.com/D9422
js/src/vm/Debugger.cpp
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -7464,17 +7464,17 @@ class DebuggerScriptIsInCatchScopeMatche
     ReturnType match(HandleScript script) {
         if (!EnsureScriptOffsetIsValid(cx_, script, offset_)) {
             return false;
         }
 
         if (script->hasTrynotes()) {
             for (const JSTryNote& tn : script->trynotes()) {
                 if (tn.start <= offset_ &&
-                    offset_ <= tn.start + tn.length &&
+                    offset_ < tn.start + tn.length &&
                     tn.kind == JSTRY_CATCH)
                 {
                     isInCatch_ = true;
                     return true;
                 }
             }
         }
         isInCatch_ = false;