Wrap callback in try/finally

This ensures we clean up always if the callback throws.
babel · Jul 22, 2018 · 094ef31 · 094ef31
1 parent afd0638
commit 094ef31
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/packages/babel-parser/src/parser/expression.js b/packages/babel-parser/src/parser/expression.js
@@ -2131,10 +2131,11 @@ export default class ExpressionParser extends LValParser {
       maxTopicIndex: null,
     };
 
-    const callbackResult = callback();
-
-    this.state.topicContext = outerContextTopicState;
-    return callbackResult;
+    try {
+      return callback();
+    } finally {
+      this.state.topicContext = outerContextTopicState;
+    }
   }
 
   // Disable topic references from outer contexts within syntax constructs
@@ -2153,10 +2154,11 @@ export default class ExpressionParser extends LValParser {
       maxTopicIndex: null,
     };
 
-    const callbackResult = callback();
-
-    this.state.topicContext = outerContextTopicState;
-    return callbackResult;
+    try {
+      return callback();
+    } finally {
+      this.state.topicContext = outerContextTopicState;
+    }
   }
 
   // Register the use of a primary topic reference (`#`) within the current