Merge branch 'maint-1.6.1' into maint-1.6.2

gitster · gitster · commit 34ab57df974a · 2009-05-24T15:29:23.000-07:00
* maint-1.6.1:
  http-push.c::remove_locks(): fix use after free
diff --git 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;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1378,8 +1378,9 @@ static void remove_locks(void)`
`1378`	`1378`
`1379`	`1379`	`fprintf(stderr, "Removing remote locks...\n");`
`1380`	`1380`	`while (lock) {`
	`1381`	`+ struct remote_lock *next = lock->next;`
`1381`	`1382`	`unlock_remote(lock);`
`1382`		`- lock = lock->next;`
	`1383`	`+ lock = next;`
`1383`	`1384`	`}`
`1384`	`1385`	`}`
`1385`	`1386`