From e1881bba730c47b0af679a97853222733f1f20f5 Mon Sep 17 00:00:00 2001
From: Sean Mann <sean@drizzlybear.com>
Date: Mon, 5 Jul 2021 16:35:11 -0700
Subject: [PATCH 1/3] gc callback can happen between init and set this causes a
 confusing OOM crash because max mem is 0 at this point, so if the callback is
 hit, then the isolate will terminate no matter what.

---
 .../mini_racer_extension.cc                     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ext/mini_racer_extension/mini_racer_extension.cc b/ext/mini_racer_extension/mini_racer_extension.cc
index 255a2962..b91de648 100644
--- a/ext/mini_racer_extension/mini_racer_extension.cc
+++ b/ext/mini_racer_extension/mini_racer_extension.cc
@@ -467,6 +467,15 @@ nogvl_context_eval(void* arg) {
 
     IsolateData::Init(isolate);
 
+    if (eval_params->max_memory > 0) {
+        IsolateData::Set(isolate, IsolateData::MEM_SOFTLIMIT_MAX, eval_params->max_memory);
+printf("lim: %lu %lu aaa\n", (size_t)IsolateData::Get(isolate, IsolateData::MEM_SOFTLIMIT_MAX), eval_params->max_memory);
+        if (!isolate_info->added_gc_cb) {
+        isolate->AddGCEpilogueCallback(gc_callback);
+            isolate_info->added_gc_cb = true;
+        }
+    }
+
     MaybeLocal<Script> parsed_script;
 
     if (eval_params->filename) {
@@ -491,14 +500,6 @@ nogvl_context_eval(void* arg) {
         result->message->Reset(isolate, trycatch.Exception());
     } else {
         // parsing successful
-        if (eval_params->max_memory > 0) {
-            IsolateData::Set(isolate, IsolateData::MEM_SOFTLIMIT_MAX, eval_params->max_memory);
-            if (!isolate_info->added_gc_cb) {
-            isolate->AddGCEpilogueCallback(gc_callback);
-                isolate_info->added_gc_cb = true;
-            }
-        }
-
         if (eval_params->marshal_stackdepth > 0) {
             StackCounter::SetMax(isolate, eval_params->marshal_stackdepth);
         }

From 46dd270cdd91fe9cbfd93c837a484a24395e654b Mon Sep 17 00:00:00 2001
From: Sean Mann <sean@drizzlybear.com>
Date: Mon, 5 Jul 2021 16:37:20 -0700
Subject: [PATCH 2/3] rem printf

---
 ext/mini_racer_extension/mini_racer_extension.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ext/mini_racer_extension/mini_racer_extension.cc b/ext/mini_racer_extension/mini_racer_extension.cc
index b91de648..71c7c094 100644
--- a/ext/mini_racer_extension/mini_racer_extension.cc
+++ b/ext/mini_racer_extension/mini_racer_extension.cc
@@ -469,7 +469,6 @@ nogvl_context_eval(void* arg) {
 
     if (eval_params->max_memory > 0) {
         IsolateData::Set(isolate, IsolateData::MEM_SOFTLIMIT_MAX, eval_params->max_memory);
-printf("lim: %lu %lu aaa\n", (size_t)IsolateData::Get(isolate, IsolateData::MEM_SOFTLIMIT_MAX), eval_params->max_memory);
         if (!isolate_info->added_gc_cb) {
         isolate->AddGCEpilogueCallback(gc_callback);
             isolate_info->added_gc_cb = true;

From cdbdbc2ffa29d132a6c2babd5a00d4d0f3477920 Mon Sep 17 00:00:00 2001
From: seanmakesgames <sean.gubelman@gmail.com>
Date: Mon, 5 Jul 2021 17:51:02 -0700
Subject: [PATCH 3/3] Update ext/mini_racer_extension/mini_racer_extension.cc

Co-authored-by: nightpool <nightpool@users.noreply.github.com>
---
 ext/mini_racer_extension/mini_racer_extension.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/mini_racer_extension/mini_racer_extension.cc b/ext/mini_racer_extension/mini_racer_extension.cc
index 71c7c094..f930ac83 100644
--- a/ext/mini_racer_extension/mini_racer_extension.cc
+++ b/ext/mini_racer_extension/mini_racer_extension.cc
@@ -470,7 +470,7 @@ nogvl_context_eval(void* arg) {
     if (eval_params->max_memory > 0) {
         IsolateData::Set(isolate, IsolateData::MEM_SOFTLIMIT_MAX, eval_params->max_memory);
         if (!isolate_info->added_gc_cb) {
-        isolate->AddGCEpilogueCallback(gc_callback);
+            isolate->AddGCEpilogueCallback(gc_callback);
             isolate_info->added_gc_cb = true;
         }
     }