luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unix: fix error path in uv_setup_args()

Browse Source 
Only update the `process_title` struct on success, otherwise it points
to memory libuv doesn't own. Notably, libuv only owns `argv[0]` _after_
copying the argv table.

PR-URL: https://github.com/libuv/libuv/pull/2668
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
This commit is contained in:
Ben Noordhuis 2020-02-08 12:28:34 +01:00
parent fb4c563132
commit ea3a5318ab
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/unix/proctitle.c
View File

@ -24,17 +24,18 @@
#include <stdlib.h>
#include <string.h>
struct uv__process_title {
char* str;
size_t len;
};
extern void uv__set_process_title(const char* title);
static uv_mutex_t process_title_mutex;
static uv_once_t process_title_mutex_once = UV_ONCE_INIT;
static struct uv__process_title process_title;
static void* args_mem;
static struct {
char* str;
size_t len;
} process_title;
static void init_process_title_mutex_once(void) {
uv_mutex_init(&process_title_mutex);
@ -42,6 +43,7 @@ static void init_process_title_mutex_once(void) {
char** uv_setup_args(int argc, char** argv) {
struct uv__process_title pt;
char** new_argv;
size_t size;
char* s;
@ -57,12 +59,12 @@ char** uv_setup_args(int argc, char** argv) {
#if defined(__MVS__)
/* argv is not adjacent. So just use argv[0] */
process_title.str = argv[0];
process_title.len = strlen(argv[0]);
pt.str = argv[0];
pt.len = strlen(argv[0]);
#else
process_title.str = argv[0];
process_title.len = argv[argc - 1] + strlen(argv[argc - 1]) - argv[0];
assert(process_title.len + 1 == size); /* argv memory should be adjacent. */
pt.str = argv[0];
pt.len = argv[argc - 1] + strlen(argv[argc - 1]) - argv[0];
assert(pt.len + 1 == size); /* argv memory should be adjacent. */
#endif
/* Add space for the argv pointers. */
@ -71,7 +73,6 @@ char** uv_setup_args(int argc, char** argv) {
new_argv = uv__malloc(size);
if (new_argv == NULL)
return argv;
args_mem = new_argv;
/* Copy over the strings and set up the pointer table. */
s = (char*) &new_argv[argc + 1];
@ -83,6 +84,9 @@ char** uv_setup_args(int argc, char** argv) {
}
new_argv[i] = NULL;
args_mem = new_argv;
process_title = pt;
return new_argv;
}