update libc argv patch
This commit is contained in:
parent
066a91bd31
commit
6a177ba62b
|
@ -85,7 +85,7 @@ index 150640ddf3..e511897600 100644
|
||||||
DUMMY(int , -1, getpriority, (int, int))
|
DUMMY(int , -1, getpriority, (int, int))
|
||||||
DUMMY(int , -1, getrusage, (int, rusage *))
|
DUMMY(int , -1, getrusage, (int, rusage *))
|
||||||
DUMMY_SILENT(uid_t , 0, getuid, (void))
|
DUMMY_SILENT(uid_t , 0, getuid, (void))
|
||||||
From 01bac4b0add9da8bbb4fcbe339605533ab7e7be5 Mon Sep 17 00:00:00 2001
|
From 73a27bd29a3dddc9cad8fbbc6303dd09776e5bdb Mon Sep 17 00:00:00 2001
|
||||||
From: Emery Hemingway <ehmry@posteo.net>
|
From: Emery Hemingway <ehmry@posteo.net>
|
||||||
Date: Thu, 26 Nov 2020 12:47:30 +0100
|
Date: Thu, 26 Nov 2020 12:47:30 +0100
|
||||||
Subject: [PATCH] libc: always set argv and envp to valid arrays
|
Subject: [PATCH] libc: always set argv and envp to valid arrays
|
||||||
|
@ -93,16 +93,15 @@ MIME-Version: 1.0
|
||||||
Content-Type: text/plain; charset=UTF-8
|
Content-Type: text/plain; charset=UTF-8
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
The argument array passed to main(…) must be a null terminated array, even
|
The arrays passed to main(…) must always be valid null-terminated arrays.
|
||||||
if argc is zero. Set at least one environment variable in any case.
|
|
||||||
|
|
||||||
Fix #3955
|
Fix #3955
|
||||||
---
|
---
|
||||||
repos/libports/include/libc/args.h | 29 +++++++++++++++++++++++++----
|
repos/libports/include/libc/args.h | 19 +++++++++++++++----
|
||||||
1 file changed, 25 insertions(+), 4 deletions(-)
|
1 file changed, 15 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/repos/libports/include/libc/args.h b/repos/libports/include/libc/args.h
|
diff --git a/repos/libports/include/libc/args.h b/repos/libports/include/libc/args.h
|
||||||
index 76645d82cb..fab299b8d3 100644
|
index 76645d82cb..ca9a8fd38a 100644
|
||||||
--- a/repos/libports/include/libc/args.h
|
--- a/repos/libports/include/libc/args.h
|
||||||
+++ b/repos/libports/include/libc/args.h
|
+++ b/repos/libports/include/libc/args.h
|
||||||
@@ -25,6 +25,7 @@ static void populate_args_and_env(Libc::Env &env, int &argc, char **&argv, char
|
@@ -25,6 +25,7 @@ static void populate_args_and_env(Libc::Env &env, int &argc, char **&argv, char
|
||||||
|
@ -113,7 +112,7 @@ index 76645d82cb..fab299b8d3 100644
|
||||||
|
|
||||||
env.config([&] (Xml_node const &node) {
|
env.config([&] (Xml_node const &node) {
|
||||||
|
|
||||||
@@ -40,12 +41,25 @@ static void populate_args_and_env(Libc::Env &env, int &argc, char **&argv, char
|
@@ -40,12 +41,20 @@ static void populate_args_and_env(Libc::Env &env, int &argc, char **&argv, char
|
||||||
++envc;
|
++envc;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -121,13 +120,8 @@ index 76645d82cb..fab299b8d3 100644
|
||||||
+ if (argc == 0 && envc == 0) {
|
+ if (argc == 0 && envc == 0) {
|
||||||
+ /*
|
+ /*
|
||||||
+ * If argc is zero then argv is still a NULL-terminated array.
|
+ * If argc is zero then argv is still a NULL-terminated array.
|
||||||
+ *
|
|
||||||
+ * Invent an enviromental variable in case the application
|
|
||||||
+ * does not handle an empty environment. SHLVL=0 is
|
|
||||||
+ * just an indication that this application lacks a parent
|
|
||||||
+ * shell.
|
|
||||||
+ */
|
+ */
|
||||||
+ static char const *args[] = { nullptr, "SHLVL=0", nullptr };
|
+ static char const *args[] = { nullptr, nullptr };
|
||||||
+ argc = 0;
|
+ argc = 0;
|
||||||
+ argv = (char**)&args;
|
+ argv = (char**)&args;
|
||||||
+ envp = &argv[1];
|
+ envp = &argv[1];
|
||||||
|
@ -138,22 +132,17 @@ index 76645d82cb..fab299b8d3 100644
|
||||||
- argv = (char**)malloc((argc + envc + 1) * sizeof(char*));
|
- argv = (char**)malloc((argc + envc + 1) * sizeof(char*));
|
||||||
- envp = &argv[argc];
|
- envp = &argv[argc];
|
||||||
+ /* arguments and environment are arranged System V style (but don't count on it) */
|
+ /* arguments and environment are arranged System V style (but don't count on it) */
|
||||||
+ argv = (char**)malloc((argc + max(envc, 1) + 2) * sizeof(char*));
|
+ argv = (char**)malloc((argc + envc + 2) * sizeof(char*));
|
||||||
+ envp = &argv[argc+1];
|
+ envp = &argv[argc+1];
|
||||||
|
|
||||||
/* read the arguments */
|
/* read the arguments */
|
||||||
int arg_i = 0;
|
int arg_i = 0;
|
||||||
@@ -123,6 +137,13 @@ static void populate_args_and_env(Libc::Env &env, int &argc, char **&argv, char
|
@@ -123,6 +132,8 @@ static void populate_args_and_env(Libc::Env &env, int &argc, char **&argv, char
|
||||||
catch (Xml_node::Nonexistent_attribute) { }
|
catch (Xml_node::Nonexistent_attribute) { }
|
||||||
});
|
});
|
||||||
|
|
||||||
+ /* argv and envp are both NULL terminated */
|
+ /* argv and envp are both NULL terminated */
|
||||||
+
|
|
||||||
+ argv[arg_i] = NULL;
|
+ argv[arg_i] = NULL;
|
||||||
+
|
|
||||||
+ /* invent an env-var if none are present, see note above */
|
|
||||||
+ if (env_i == 0)
|
|
||||||
+ envp[env_i++] = (char*)"SHLVL=0";
|
|
||||||
envp[env_i] = NULL;
|
envp[env_i] = NULL;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue