From: Johannes Schindelin Date: Wed, 4 Feb 2009 01:50:15 +0000 (+0100) Subject: apply: fix access to an uninitialized mode variable, found by valgrind X-Git-Tag: v1.6.1.3~1^2~7 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e1e4389832f32bb6ce029d6a6b110aa9ec768ea8;p=git.git apply: fix access to an uninitialized mode variable, found by valgrind When 'tpatch' was initialized successfully, st_mode was already taken from the previous diff. We should not try to override it with data from an lstat() that was never called. This is a companion patch to 7a07841(git-apply: handle a patch that touches the same path more than once better). Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/builtin-apply.c b/builtin-apply.c index 50b623e54..7a1ff041f 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -2445,7 +2445,7 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s return error("%s: %s", old_name, strerror(errno)); } - if (!cached) + if (!cached && !tpatch) st_mode = ce_mode_from_stat(*ce, st->st_mode); if (patch->is_new < 0)