File 2056-esock-Fixed-one-memory-sanitizer-issue.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2056-esock-Fixed-one-memory-sanitizer-issue.patch of Package erlang (Revision b86624bd0b247ddee296914ae2ffe962)

Currently displaying revision b86624bd0b247ddee296914ae2ffe962 , Show latest

From 73c834c47b0f561d413b591257e5290f2c19a07b Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 18 Nov 2021 10:48:27 +0100
Subject: [PATCH 56/58] [esock] Fixed one memory sanitizer issue

OTP-17528
---
 erts/emulator/nifs/common/prim_socket_nif.c | 1 +
 erts/emulator/nifs/common/socket_util.c     | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/erts/emulator/nifs/common/prim_socket_nif.c b/erts/emulator/nifs/common/prim_socket_nif.c
index 9e97039ec5..4a6869320f 100644
--- a/erts/emulator/nifs/common/prim_socket_nif.c
+++ b/erts/emulator/nifs/common/prim_socket_nif.c
@@ -14000,6 +14000,7 @@ ERL_NIF_TERM encode_ioctl_ifconf(ErlNifEnv*       env,
 	   ("SOCKET", "encode_ioctl_ifconf -> all entries encoded\r\n", i) );
 
     result = esock_make_ok2(env, MKLA(env, array, len));
+    FREE(array);
 
   } else {
 
diff --git a/erts/emulator/nifs/common/socket_util.c b/erts/emulator/nifs/common/socket_util.c
index 788baa85b2..bdc2cf86ce 100644
--- a/erts/emulator/nifs/common/socket_util.c
+++ b/erts/emulator/nifs/common/socket_util.c
@@ -2303,10 +2303,12 @@ void make_sockaddr_ll(ErlNifEnv*    env,
 
 
 extern
-ERL_NIF_TERM esock_make_new_binary(ErlNifEnv *env, void *buf, size_t size) {
+ERL_NIF_TERM esock_make_new_binary(ErlNifEnv *env, void *buf, size_t size)
+{
     ERL_NIF_TERM term;
 
     sys_memcpy(enif_make_new_binary(env, size, &term), buf, size);
+
     return term;
 }
 
@@ -2325,7 +2327,8 @@ ERL_NIF_TERM esock_make_new_binary(ErlNifEnv *env, void *buf, size_t size) {
  *     badarg
  */
 extern
-BOOLEAN_T esock_is_integer(ErlNifEnv *env, ERL_NIF_TERM term) {
+BOOLEAN_T esock_is_integer(ErlNifEnv *env, ERL_NIF_TERM term)
+{
     double d;
 
     /* Test that it is a number() but not a float(),
-- 
2.31.1

Places

File 2056-esock-Fixed-one-memory-sanitizer-issue.patch of Package erlang (Revision b86624bd0b247ddee296914ae2ffe962)

Places