Commit Diff

Commit:
2734319d6bf828cb8fdc44a9030605f7bb4c32d1
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
fix crash in got log due to NULL-deref in got_object_blob_close Reported by Mikhail (thanks!), ok jamsek
Actions:
Patch | Tree
commit - 8c28a2abbc4aeeb588826ad0010267d507e71ff8
commit + 2734319d6bf828cb8fdc44a9030605f7bb4c32d1
blob - a51a450a06ab2800d2fe4a200fc31cc59364dac6
blob + 8ff7e074110ce8eb022c3fee11169b99a0e583fe
--- got/got.c
+++ got/got.c
@@ -3708,7 +3708,8 @@ done:
 		got_object_blob_close(blob1);
 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
 		err = got_error_from_errno("close");
-	got_object_blob_close(blob2);
+	if (blob2)
+		got_object_blob_close(blob2);
 	if (f1 && fclose(f1) == EOF && err == NULL)
 		err = got_error_from_errno("fclose");
 	if (f2 && fclose(f2) == EOF && err == NULL)