Merge branch 'maint-1.6.0' into maint-1.6.1

gitster · gitster · commit ff6e93fe605b · 2009-05-24T15:29:13.000-07:00
* maint-1.6.0:
  http-push.c::remove_locks(): fix use after free
diff --git a/http-push.c b/http-push.c
@@ -1356,8 +1356,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
`@@ -1356,8 +1356,9 @@ static void remove_locks(void)`
`1356`	`1356`
`1357`	`1357`	`fprintf(stderr, "Removing remote locks...\n");`
`1358`	`1358`	`while (lock) {`
	`1359`	`+ struct remote_lock *next = lock->next;`
`1359`	`1360`	`unlock_remote(lock);`
`1360`		`- lock = lock->next;`
	`1361`	`+ lock = next;`
`1361`	`1362`	`}`
`1362`	`1363`	`}`
`1363`	`1364`