Fix crash when got stack overflow error while computing bytecode posi…

…tion Signed-off-by: Seonghyun Kim <[email protected]>
Samsung · Sep 24, 2024 · 7365c2a · 7365c2a
1 parent 32f1ebb
commit 7365c2a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/src/interpreter/ByteCode.cpp b/src/interpreter/ByteCode.cpp
@@ -187,7 +187,7 @@ ExtendedNodeLOC ByteCodeBlock::computeNodeLOCFromByteCode(Context* c, size_t cod
         fillLOCData(c, locData);
     }
 
-    size_t index = 0;
+    size_t index = SIZE_MAX;
     for (size_t i = 0; i < locData->size(); i++) {
         if ((*locData)[i].first == codePosition) {
             index = (*locData)[i].second;
@@ -198,8 +198,13 @@ ExtendedNodeLOC ByteCodeBlock::computeNodeLOCFromByteCode(Context* c, size_t cod
         }
     }
 
-    ASSERT(index >= cb->functionStart().index);
-    size_t indexRelatedWithScript = index;
+    size_t indexRelatedWithScript = 0;
+    if (index == SIZE_MAX) {
+        indexRelatedWithScript = cb->functionStart().index;
+    } else {
+        ASSERT(index >= cb->functionStart().index);
+        indexRelatedWithScript = index;
+    }
     index -= cb->functionStart().index;
 
     auto result = computeNodeLOC(cb->src(), cb->functionStart(), index);

diff --git a/src/interpreter/ByteCodeGenerator.cpp b/src/interpreter/ByteCodeGenerator.cpp
@@ -305,14 +305,22 @@ void ByteCodeGenerator::collectByteCodeLOCData(Context* context, InterpretedCode
 
     // Parsing
     Node* ast = nullptr;
-    if (codeBlock->isGlobalCodeBlock() || codeBlock->isEvalCode()) {
-        InterpretedCodeBlock* parentCodeBlock = codeBlock->parent();
-        bool allowSC = parentCodeBlock ? parentCodeBlock->allowSuperCall() : false;
-        bool allowSP = parentCodeBlock ? parentCodeBlock->allowSuperProperty() : false;
-        ast = esprima::parseProgram(context, codeBlock->src(), esprima::generateClassInfoFrom(context, codeBlock->parent()),
-                                    codeBlock->script()->isModule(), codeBlock->isStrict(), codeBlock->inWith(), allowSC, allowSP, false, true);
-    } else {
-        ast = esprima::parseSingleFunction(context, codeBlock);
+    // Parsing
+    try {
+        if (codeBlock->isGlobalCodeBlock() || codeBlock->isEvalCode()) {
+            InterpretedCodeBlock* parentCodeBlock = codeBlock->parent();
+            bool allowSC = parentCodeBlock ? parentCodeBlock->allowSuperCall() : false;
+            bool allowSP = parentCodeBlock ? parentCodeBlock->allowSuperProperty() : false;
+            ast = esprima::parseProgram(context, codeBlock->src(), esprima::generateClassInfoFrom(context, codeBlock->parent()),
+                                        codeBlock->script()->isModule(), codeBlock->isStrict(), codeBlock->inWith(), allowSC, allowSP, false, true);
+        } else {
+            ast = esprima::parseSingleFunction(context, codeBlock);
+        }
+    } catch (esprima::Error* orgError) {
+        // ignore error
+        context->astAllocator().reset();
+        GC_enable();
+        return;
     }
 
     // Generate ByteCode