From: Gerhard Sittig <redacted>
Date: Thu, 8 Feb 2018 21:06:53 +0000 (+0100)
Subject: output/srzip: silence "use after free" compiler warning
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=d3ec7035bc543e983aeb8cee723cb2c78f0f109a;hp=a21fef07b65ef6fb77ac2b6a96de51177a84302a;p=libsigrok.git

output/srzip: silence "use after free" compiler warning

Defer memory g_free() until after the data gets accessed one last time.

This was reported by clang's scan-build.
---

diff --git a/src/output/srzip.c b/src/output/srzip.c
index 249fe057..6357a1c9 100644
--- a/src/output/srzip.c
+++ b/src/output/srzip.c
@@ -379,12 +379,13 @@ static int zip_append_analog(const struct sr_output *o,
 	analogsrc = zip_source_buffer(archive, chunkbuf, chunksize, FALSE);
 	chunkname = g_strdup_printf("%s-%u", basename, next_chunk_num);
 	i = zip_add(archive, chunkname, analogsrc);
-	g_free(chunkname);
 	if (i < 0) {
 		sr_err("Failed to add chunk '%s': %s", chunkname, zip_strerror(archive));
+		g_free(chunkname);
 		zip_source_free(analogsrc);
 		goto err_free_chunkbuf;
 	}
+	g_free(chunkname);
 	if (zip_close(archive) < 0) {
 		sr_err("Error saving session file: %s", zip_strerror(archive));
 		goto err_free_chunkbuf;