Commit Diff

Commit:
664d70035d306f09fe381da2dfaa725623c9e252
From:
Omar Polo <op@omarpolo.com>
Via:
Thomas Adam <thomas@xteddy.org>
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 - 7303e8c811ca9c78e98cb71ca412092c4f71387a
commit + 664d70035d306f09fe381da2dfaa725623c9e252
blob - c0a98144883916b626903410a738267157a95ae4
blob + 293d3842bc39e809e4591897a7a0866c1a9f718f
--- got/got.c
+++ got/got.c
@@ -3707,7 +3707,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)