Merge branch 'bc/fetch-pack-clear-alternate-shallow'

gitster · gitster · commit 8f0f46539a8c · 2019-02-06T22:05:30.000-08:00
"git fetch" over protocol v2 that needs to make a second connection
to backfill tags did not clear a variable that holds shallow
repository information correctly, leading to an access of freed
piece of memory.

* bc/fetch-pack-clear-alternate-shallow:
  fetch-pack: clear alternate shallow in one more place
  fetch-pack: clear alternate shallow when complete
diff --git a/fetch-pack.c b/fetch-pack.c
@@ -1290,6 +1290,8 @@ static void receive_shallow_info(struct fetch_pack_args *args,
 		setup_alternate_shallow(&shallow_lock, &alternate_shallow_file,
 					NULL);
 		args->deepen = 1;
+	} else {
+		alternate_shallow_file = NULL;
 	}
 }
 
@@ -1514,6 +1516,7 @@ static void update_shallow(struct fetch_pack_args *args,
 			rollback_lock_file(&shallow_lock);
 		} else
 			commit_lock_file(&shallow_lock);
+		alternate_shallow_file = NULL;
 		return;
 	}
 
@@ -1537,6 +1540,7 @@ static void update_shallow(struct fetch_pack_args *args,
 						&alternate_shallow_file,
 						&extra);
 			commit_lock_file(&shallow_lock);
+			alternate_shallow_file = NULL;
 		}
 		oid_array_clear(&extra);
 		return;
@@ -1576,6 +1580,7 @@ static void update_shallow(struct fetch_pack_args *args,
 		commit_lock_file(&shallow_lock);
 		oid_array_clear(&extra);
 		oid_array_clear(&ref);
+		alternate_shallow_file = NULL;
 		return;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1290,6 +1290,8 @@ static void receive_shallow_info(struct fetch_pack_args *args,`
`1290`	`1290`	`setup_alternate_shallow(&shallow_lock, &alternate_shallow_file,`
`1291`	`1291`	`NULL);`
`1292`	`1292`	`args->deepen = 1;`
	`1293`	`+ } else {`
	`1294`	`+ alternate_shallow_file = NULL;`
`1293`	`1295`	`}`
`1294`	`1296`	`}`
`1295`	`1297`
`@@ -1514,6 +1516,7 @@ static void update_shallow(struct fetch_pack_args *args,`
`1514`	`1516`	`rollback_lock_file(&shallow_lock);`
`1515`	`1517`	`} else`
`1516`	`1518`	`commit_lock_file(&shallow_lock);`
	`1519`	`+ alternate_shallow_file = NULL;`
`1517`	`1520`	`return;`
`1518`	`1521`	`}`
`1519`	`1522`
`@@ -1537,6 +1540,7 @@ static void update_shallow(struct fetch_pack_args *args,`
`1537`	`1540`	`&alternate_shallow_file,`
`1538`	`1541`	`&extra);`
`1539`	`1542`	`commit_lock_file(&shallow_lock);`
	`1543`	`+ alternate_shallow_file = NULL;`
`1540`	`1544`	`}`
`1541`	`1545`	`oid_array_clear(&extra);`
`1542`	`1546`	`return;`
`@@ -1576,6 +1580,7 @@ static void update_shallow(struct fetch_pack_args *args,`
`1576`	`1580`	`commit_lock_file(&shallow_lock);`
`1577`	`1581`	`oid_array_clear(&extra);`
`1578`	`1582`	`oid_array_clear(&ref);`
	`1583`	`+ alternate_shallow_file = NULL;`
`1579`	`1584`	`return;`
`1580`	`1585`	`}`
`1581`	`1586`