Skip to content

Commit ec09954

Browse files
pcloudsgitster
authored andcommitted
fetch-pack: check for valid commit from server
A malicious server can return ACK with non-existent SHA-1 or not a commit. lookup_commit() in this case may return NULL. Do not let fetch-pack crash by accessing NULL address in this case. Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a47a645 commit ec09954

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

builtin/fetch-pack.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,8 @@ static int find_common(int fd[2], unsigned char *result_sha1,
395395
case ACK_continue: {
396396
struct commit *commit =
397397
lookup_commit(result_sha1);
398+
if (!commit)
399+
die("invalid commit %s", sha1_to_hex(result_sha1));
398400
if (args.stateless_rpc
399401
&& ack == ACK_common
400402
&& !(commit->object.flags & COMMON)) {

0 commit comments

Comments
 (0)