Sync with Git 2.30.2 for CVE-2021-21300
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
@ -993,6 +993,7 @@ int finish_command(struct child_process *cmd)
|
||||
int ret = wait_or_whine(cmd->pid, cmd->argv[0], 0);
|
||||
trace2_child_exit(cmd, ret);
|
||||
child_process_clear(cmd);
|
||||
invalidate_lstat_cache();
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -1294,13 +1295,19 @@ error:
|
||||
int finish_async(struct async *async)
|
||||
{
|
||||
#ifdef NO_PTHREADS
|
||||
return wait_or_whine(async->pid, "child process", 0);
|
||||
int ret = wait_or_whine(async->pid, "child process", 0);
|
||||
|
||||
invalidate_lstat_cache();
|
||||
|
||||
return ret;
|
||||
#else
|
||||
void *ret = (void *)(intptr_t)(-1);
|
||||
|
||||
if (pthread_join(async->tid, &ret))
|
||||
error("pthread_join failed");
|
||||
invalidate_lstat_cache();
|
||||
return (int)(intptr_t)ret;
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user