Merge pull request #4906 from QBobWatson/bugfix

Fix segfault in loose_backend__readstream

Merge pull request #4906 from QBobWatson/bugfix
Fix segfault in loose_backend__readstream
da8138b0 · Edward Thomson · GitHub · 8092c431 · 2f3c4b69 · da8138b0
Unverified Commit da8138b0 authored Dec 06, 2018 by Edward Thomson Committed by GitHub Dec 06, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

src/odb_loose.c
+9 -5

No files found.
--- a/src/odb_loose.c
+++ b/src/odb_loose.c
@@ -1028,11 +1028,15 @@ static int loose_backend__readstream(
 done:
 	if (error < 0) {
-		git_futils_mmap_free(&stream->map);
+		if (stream) {
-		git_zstream_free(&stream->zstream);
+			git_futils_mmap_free(&stream->map);
-		git_hash_ctx_cleanup(hash_ctx);
+			git_zstream_free(&stream->zstream);
-		git__free(hash_ctx);
+			git__free(stream);
-		git__free(stream);
+		}
+		if (hash_ctx) {
+			git_hash_ctx_cleanup(hash_ctx);
+			git__free(hash_ctx);
+		}
 	}
 	git_buf_dispose(&object_path);