PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Null terminate argv array in Go land not C land

Browse Source
This commit is contained in:
Derek Parker 2015-07-07 14:57:36 -05:00
parent c1e7f8c45a
commit 776e2a593f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proc/exec_darwin.c
View File

@ -12,8 +12,6 @@ fork_exec(char *argv0, char **argv, int size,
int fd[2];
if (pipe(fd) < 0) return -1;
argv[size-1] = '\0';
kern_return_t kret;
pid_t pid = fork();
if (pid > 0) {

7
proc/proc_darwin.go
View File

@ -50,16 +50,19 @@ func Launch(cmd []string) (*Process, error) {
}
argv0 := C.CString(argv0Go)
argvSlice := make([]*C.char, 0, len(cmd)+1)
for _, arg := range cmd {
argvSlice = append(argvSlice, C.CString(arg))
}
// argv array must be null terminated.
argvSlice = append(argvSlice, nil)
dbp := New(0)
var pid int
dbp.execPtraceFunc(func() {
ret := C.fork_exec(argv0, &argvSlice[0], C.int(len(argvSlice)), &dbp.os.task, &dbp.os.portSet, &dbp.os.exceptionPort, &dbp.os.notificationPort)
ret := C.fork_exec(argv0, &argvSlice[0], C.int(len(argvSlice)),
&dbp.os.task, &dbp.os.portSet, &dbp.os.exceptionPort,
&dbp.os.notificationPort)
pid = int(ret)
})
if pid <= 0 {