blob: a5bb4bca00f9bc1261ca2dde292bbc0c5b83512c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
From cc0dbd5f09337c187156fe8b697245e6ea9263d0 Mon Sep 17 00:00:00 2001
From: Alexander Monakov <amonakov@ispras.ru>
Date: Sun, 3 Sep 2017 22:12:21 +0300
Subject: 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 62d5095..da18775 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;
}
--
cgit v0.11.2
|
