Merge pull request libgit2#6836 from gensmusic/main

ethomson · web-flow · commit 585210ab2108 · 2024-06-25T11:49:28.000+01:00
odb: conditional git_hash_ctx_cleanup in git_odb_stream
diff --git a/src/libgit2/odb.c b/src/libgit2/odb.c
@@ -1796,7 +1796,8 @@ void git_odb_stream_free(git_odb_stream *stream)
 	if (stream == NULL)
 		return;
 
-	git_hash_ctx_cleanup(stream->hash_ctx);
+	if (stream->hash_ctx)
+		git_hash_ctx_cleanup(stream->hash_ctx);
 	git__free(stream->hash_ctx);
 	stream->free(stream);
 }

Original file line number	Diff line number	Diff line change
`@@ -1796,7 +1796,8 @@ void git_odb_stream_free(git_odb_stream *stream)`
`1796`	`1796`	`if (stream == NULL)`
`1797`	`1797`	`return;`
`1798`	`1798`
`1799`		`- git_hash_ctx_cleanup(stream->hash_ctx);`
	`1799`	`+ if (stream->hash_ctx)`
	`1800`	`+ git_hash_ctx_cleanup(stream->hash_ctx);`
`1800`	`1801`	`git__free(stream->hash_ctx);`
`1801`	`1802`	`stream->free(stream);`
`1802`	`1803`	`}`