Skip to content

Commit ba45ef7

Browse files
jeffhostetlerdscho
authored andcommitted
sub-process: do not borrow cmd pointer from caller
Teach subprocess_start() to use a copy of the passed `cmd` string rather than borrowing the buffer from the caller. Some callers of subprocess_start() pass the value returned from find_hook() which points to a static buffer and therefore is only good until the next call to find_hook(). This could cause problems for the long-running background processes managed by sub-process.c where later calls to subprocess_find_entry() to get an existing process will fail. This could cause more than 1 long-running process to be created. TODO Need to confirm, but if only read_object_hook() uses TODO subprocess_start() in this manner, we could drop this TODO commit when we drop support for read_object_hook(). Signed-off-by: Jeff Hostetler <[email protected]>
1 parent 7b4dae2 commit ba45ef7

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

sub-process.c

+8-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,12 @@ int subprocess_start(struct hashmap *hashmap, struct subprocess_entry *entry, co
8181
int err;
8282
struct child_process *process;
8383

84-
entry->cmd = cmd;
84+
// BUGBUG most callers to subprocess_start() pass in "cmd" the value
85+
// BUGBUG of find_hook() which returns a static buffer (that's only
86+
// BUGBUG good until the next call to find_hook()).
87+
// BUGFIX Defer assignment until we copy the string in our argv.
88+
// entry->cmd = cmd;
89+
8590
process = &entry->process;
8691

8792
child_process_init(process);
@@ -93,6 +98,8 @@ int subprocess_start(struct hashmap *hashmap, struct subprocess_entry *entry, co
9398
process->clean_on_exit_handler = subprocess_exit_handler;
9499
process->trace2_child_class = "subprocess";
95100

101+
entry->cmd = process->args.v[0];
102+
96103
err = start_command(process);
97104
if (err) {
98105
error("cannot fork to run subprocess '%s'", cmd);

0 commit comments

Comments
 (0)