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

Overview Repositories Revisions Requests Users Attributes Meta

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

Currently displaying revision e3704281f725978c5a26174cd59024d0 , Show latest

From 35a2843905d31a171c4c16eefc3f114a7a720b6e Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 18 Nov 2021 16:47:44 +0100
Subject: [PATCH 57/58] [esock] Fixed one memory sanitizer issue

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

diff --git a/erts/emulator/nifs/common/prim_socket_nif.c b/erts/emulator/nifs/common/prim_socket_nif.c
index 4a6869320f..d8192d34ec 100644
--- a/erts/emulator/nifs/common/prim_socket_nif.c
+++ b/erts/emulator/nifs/common/prim_socket_nif.c
@@ -13626,6 +13626,7 @@ ERL_NIF_TERM esock_ioctl_gifconf(ErlNifEnv*       env,
   int           ifc_len = 0;
   int           buflen  = 100 * sizeof(struct ifreq);
   char         *buf     = MALLOC(buflen);
+  ERL_NIF_TERM  result;
 
   SSDBG( descP, ("SOCKET", "esock_ioctl_gifconf {%d} -> entry\r\n", descP->sock) );
 
@@ -13653,7 +13654,11 @@ ERL_NIF_TERM esock_ioctl_gifconf(ErlNifEnv*       env,
     buf     = (char *) REALLOC(buf, buflen);
   }
 
-  return encode_ioctl_ifconf(env, descP, &ifc);
+  result = encode_ioctl_ifconf(env, descP, &ifc);
+
+  FREE(ifc.ifc_buf);
+
+  return result;
 }
 
 
@@ -14053,7 +14058,7 @@ ERL_NIF_TERM encode_ioctl_hwaddr(ErlNifEnv*       env,
 				 struct sockaddr* addrP)
 {
   ERL_NIF_TERM eaddr;
-  unsigned int sz = sizeof(ESockAddress);
+  SOCKLEN_T    sz = sizeof(ESockAddress);
 
   esock_encode_hwsockaddr(env, (ESockAddress*) addrP, sz, &eaddr);
 
-- 
2.31.1

Places

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

Places