summaryrefslogtreecommitdiff
path: root/http-push.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-24 22:29:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-05-24 22:29:23 (GMT)
commit34ab57df974ad74cc93550bfac2f90d203837a17 (patch)
tree84da5c50e569edd9791fff35fcdc7e33a82cd504 /http-push.c
parent213195185c8aa09d6192b85a3f78bf46f19f51a4 (diff)
parentff6e93fe605b748055267fd325c760d0f32dcf92 (diff)
downloadgit-34ab57df974ad74cc93550bfac2f90d203837a17.zip
git-34ab57df974ad74cc93550bfac2f90d203837a17.tar.gz
git-34ab57df974ad74cc93550bfac2f90d203837a17.tar.bz2
Merge branch 'maint-1.6.1' into maint-1.6.2
* maint-1.6.1: http-push.c::remove_locks(): fix use after free
Diffstat (limited to 'http-push.c')
-rw-r--r--http-push.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/http-push.c b/http-push.c
index 968b6b0..f101df4 100644
--- a/http-push.c
+++ b/http-push.c
@@ -1378,8 +1378,9 @@ static void remove_locks(void)
fprintf(stderr, "Removing remote locks...\n");
while (lock) {
+ struct remote_lock *next = lock->next;
unlock_remote(lock);
- lock = lock->next;
+ lock = next;
}
}