From d7bacbc798d608f259eb2faaaf194cb9df323018 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Tue, 15 May 2018 20:42:46 +0200
Subject: erts: Fix bug in enif_binary_to_term for immediates

Symptom: Heap corruption

Expanded test case to provoke this bug
and test some more term types.
---
 erts/emulator/beam/erl_nif.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'erts/emulator/beam/erl_nif.c')

diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c
index 479a2f4809..a41145af41 100644
--- a/erts/emulator/beam/erl_nif.c
+++ b/erts/emulator/beam/erl_nif.c
@@ -1157,8 +1157,10 @@ size_t enif_binary_to_term(ErlNifEnv *dst_env,
     if (is_non_value(*term)) {
         return 0;
     }
-    erts_factory_close(&factory);
-    cache_env(dst_env);
+    if (size > 0) {
+        erts_factory_close(&factory);
+        cache_env(dst_env);
+    }
 
     ASSERT(bp > data);
     return bp - data;
-- 
cgit v1.2.3