File 0366-ERL-629-Do-not-free-module-buffer-until-it... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0366-ERL-629-Do-not-free-module-buffer-until-it-has-been-.patch of Package erlang (Revision 3aaa84d7d540d57752db68644dc4a4df)

Currently displaying revision 3aaa84d7d540d57752db68644dc4a4df , Show latest

From abce739f6a897c462b3588ce15983eb530d7e080 Mon Sep 17 00:00:00 2001
From: Jesper Eskilson <jesper.eskilson@klarna.com>
Date: Tue, 22 May 2018 11:14:19 +0200
Subject: [PATCH] ERL-629 Do not free() module buffer until it has been used

---
 lib/erl_interface/src/prog/erl_call.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/erl_interface/src/prog/erl_call.c b/lib/erl_interface/src/prog/erl_call.c
index 7577a07a3e..66265b3e6a 100644
--- a/lib/erl_interface/src/prog/erl_call.c
+++ b/lib/erl_interface/src/prog/erl_call.c
@@ -517,6 +517,15 @@ int erl_call(int argc, char **argv)
       }
      
     }
+
+    /*
+     * If we loaded any module source code, we can free the buffer
+     * now. This buffer was allocated in read_stdin().
+     */
+    if (module != NULL) {
+        free(module);
+    }
+
     /*
      * Eval the Erlang functions read from stdin/
      */
@@ -795,8 +804,6 @@ static int get_module(char **mbuf, char **mname)
     *mname = (char *) ei_chk_calloc(i+1, sizeof(char));
     memcpy(*mname, start, i);
   }
-  if (*mbuf)
-      free(*mbuf);			/* Allocated in read_stdin() */
 
   return len;
 
-- 
2.17.1

Places

File 0366-ERL-629-Do-not-free-module-buffer-until-it-has-been-.patch of Package erlang (Revision 3aaa84d7d540d57752db68644dc4a4df)

Places