[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20170903191221.5287-3-amonakov@ispras.ru>
Date: Sun, 3 Sep 2017 22:12:21 +0300
From: Alexander Monakov <amonakov@...ras.ru>
To: musl@...ts.openwall.com
Subject: [PATCH 2/2] free allocations in clearenv
This aligns clearenv with the Linux man page by setting 'environ'
rather than '*environ' to NULL, and stops it from leaking entries
allocated by the libc.
---
src/env/clearenv.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/env/clearenv.c b/src/env/clearenv.c
index 62d50952..da187752 100644
--- a/src/env/clearenv.c
+++ b/src/env/clearenv.c
@@ -1,10 +1,14 @@
#define _GNU_SOURCE
#include <stdlib.h>
+#include "libc.h"
-extern char **__environ;
+static void dummy(char *old, char *new) {}
+weak_alias(dummy, __env_rm_add);
int clearenv()
{
- __environ[0] = 0;
+ char **e = __environ;
+ __environ = 0;
+ if (e) while (*e) __env_rm_add(*e++, 0);
return 0;
}
--
2.11.0
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
