summaryrefslogtreecommitdiff
path: root/run-command.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-09 00:09:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-03-09 00:09:07 (GMT)
commit56a57652ef8e4ca2f108a8719b8caeed5e153c95 (patch)
treed8569b5c8e1b6e276a0434fb7cfb82d210e289b1 /run-command.c
parent6c46f864e5db7c88fdee1d67dcc20a4451a12ca2 (diff)
parent94f6e3e283f2adfc518b39cfc39291f1c2832ad0 (diff)
downloadgit-56a57652ef8e4ca2f108a8719b8caeed5e153c95.zip
git-56a57652ef8e4ca2f108a8719b8caeed5e153c95.tar.gz
git-56a57652ef8e4ca2f108a8719b8caeed5e153c95.tar.bz2
Sync with Git 2.30.2 for CVE-2021-21300
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'run-command.c')
-rw-r--r--run-command.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/run-command.c b/run-command.c
index 509841b..4e34623 100644
--- a/run-command.c
+++ b/run-command.c
@@ -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
}