Revert "Free the original pointer if `realloc` failed."

This reverts commit 9cdf439d.

Revert "Free the original pointer if `realloc` failed."
This reverts commit 9cdf439d.
aa578c34 · Hiroshi Mimaki · ac836000 · aa578c34
Commit aa578c34 authored Jun 30, 2020 by Hiroshi Mimaki
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

src/gc.c src/gc.c +8 -3

No files found.
--- a/src/gc.c
+++ b/src/gc.c
@@ -225,9 +225,14 @@ mrb_realloc(mrb_state *mrb, void *p, size_t len)
  p2 = mrb_realloc_simple(mrb, p, len);
  if (len == 0) return p2;
  if (p2 == NULL) {
-    mrb_free(mrb, p);
+    if (mrb->gc.out_of_memory) {
-    mrb->gc.out_of_memory = TRUE;
+      mrb_raise_nomemory(mrb);
-    mrb_raise_nomemory(mrb);
+      /* mrb_panic(mrb); */
+    }
+    else {
+      mrb->gc.out_of_memory = TRUE;
+      mrb_raise_nomemory(mrb);
+    }
  }
  else {
    mrb->gc.out_of_memory = FALSE;