aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@SteelEye.com>2005-08-13 10:29:32 -0500
committerJunio C Hamano <junkio@cox.net>2005-08-13 18:28:52 -0700
commit31f584c242e7af28018ff920b6c8d1952beadbd4 (patch)
tree4b209a3762c91b811640bdf3f0b1ca2e3de2ad15
parent3c3852e33b3e40ad64885d845cb92a52c7b15884 (diff)
downloadgit-31f584c242e7af28018ff920b6c8d1952beadbd4.tar.gz
git-31f584c242e7af28018ff920b6c8d1952beadbd4.tar.xz
[PATCH] fix git-checkout-cache segfault on parisc
The index cleanup code is executed via atexit() which is *after* main has completed, so the stack allocated cache_file has gone out of scope. Parisc seems to use stack in the destructor functions, so cache_file gets partially overwritten leading to the predictable disastrous consequences. [jc: Just to make sure, I audited other users of the function hold_index_file_for_update() to make sure they do not have this problem; everybody else uses non-stack cache_file structure and is fine. Thanks, James.] Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--checkout-cache.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/checkout-cache.c b/checkout-cache.c
index 8d67403ae..31ff57750 100644
--- a/checkout-cache.c
+++ b/checkout-cache.c
@@ -78,10 +78,11 @@ static int checkout_all(void)
static const char checkout_cache_usage[] =
"git-checkout-cache [-u] [-q] [-a] [-f] [-n] [--prefix=<string>] [--] <file>...";
+static struct cache_file cache_file;
+
int main(int argc, char **argv)
{
int i, force_filename = 0;
- struct cache_file cache_file;
int newfd = -1;
if (read_cache() < 0) {