X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fsrzip.c;h=b554558534a3587bf81d99d4e691f5b3ad03cc6e;hb=07a917521ae98260d5c913a300f34c659cc91994;hp=8d01e5f612a0248c5177b0a1e2b232bbb9e60a59;hpb=0586a0ef594603384b957e61e01ccfe25fdac824;p=libsigrok.git

diff --git a/src/output/srzip.c b/src/output/srzip.c
index 8d01e5f6..b5545585 100644
--- a/src/output/srzip.c
+++ b/src/output/srzip.c
@@ -140,8 +140,9 @@ static int zip_create(const struct sr_output *o)
 	g_key_file_set_integer(meta, devgroup, "total analog", enabled_analog_channels);
 
 	/* Make the array one entry larger than needed so we can use the final
-	 * 0 as terminator. */
+	 * entry as terminator, which is set to -1. */
 	outc->analog_index_map = g_malloc0(sizeof(gint) * (enabled_analog_channels + 1));
+	outc->analog_index_map[enabled_analog_channels] = -1;
 
 	index = 0;
 	for (l = o->sdi->channels; l; l = l->next) {
@@ -323,14 +324,6 @@ static int zip_append_analog(const struct sr_output *o,
 	unsigned int next_chunk_num, index;
 
 	outc = o->priv;
-	if (!(archive = zip_open(outc->filename, 0, NULL)))
-		return SR_ERR;
-
-	if (zip_stat(archive, "metadata", 0, &zs) < 0) {
-		sr_err("Failed to open metadata: %s", zip_strerror(archive));
-		zip_discard(archive);
-		return SR_ERR;
-	}
 
 	/* TODO: support packets covering multiple channels */
 	if (g_slist_length(analog->meaning->channels) != 1) {
@@ -342,14 +335,22 @@ static int zip_append_analog(const struct sr_output *o,
 	/* When reading the file, analog channels must be consecutive.
 	 * Thus we need a global channel index map as we don't know in
 	 * which order the channel data comes in. */
-	for (index = 0; outc->analog_index_map[index]; index++)
+	for (index = 0; outc->analog_index_map[index] != -1; index++)
 		if (outc->analog_index_map[index] == channel->index)
 			break;
-	if (!outc->analog_index_map[index])
+	if (outc->analog_index_map[index] == -1)
 		return SR_ERR_ARG;  /* Channel index was not in the list */
 
 	index += outc->first_analog_index;
 
+	if (!(archive = zip_open(outc->filename, 0, NULL)))
+		return SR_ERR;
+
+	if (zip_stat(archive, "metadata", 0, &zs) < 0) {
+		sr_err("Failed to open metadata: %s", zip_strerror(archive));
+		goto err_zip_discard;
+	}
+
 	basename = g_strdup_printf("analog-1-%u", index);
 	baselen = strlen(basename);
 	next_chunk_num = 1;
@@ -367,9 +368,10 @@ static int zip_append_analog(const struct sr_output *o,
 
 	chunksize = sizeof(float) * analog->num_samples;
 	if (!(chunkbuf = g_try_malloc(chunksize)))
-		return SR_ERR;
+		goto err_free_basename;
+
 	if (sr_analog_to_float(analog, chunkbuf) != SR_OK)
-		return SR_ERR;
+		goto err_free_chunkbuf;
 
 	analogsrc = zip_source_buffer(archive, chunkbuf, chunksize, FALSE);
 	chunkname = g_strdup_printf("%s-%u", basename, next_chunk_num);
@@ -378,16 +380,26 @@ static int zip_append_analog(const struct sr_output *o,
 	if (i < 0) {
 		sr_err("Failed to add chunk '%s': %s", chunkname, zip_strerror(archive));
 		zip_source_free(analogsrc);
-		zip_discard(archive);
-		return SR_ERR;
+		goto err_free_chunkbuf;
 	}
 	if (zip_close(archive) < 0) {
 		sr_err("Error saving session file: %s", zip_strerror(archive));
-		zip_discard(archive);
-		return SR_ERR;
+		goto err_free_chunkbuf;
 	}
 
+	g_free(basename);
+	g_free(chunkbuf);
+
 	return SR_OK;
+
+err_free_chunkbuf:
+	g_free(chunkbuf);
+err_free_basename:
+	g_free(basename);
+err_zip_discard:
+	zip_discard(archive);
+
+	return SR_ERR;
 }
 
 static int receive(const struct sr_output *o, const struct sr_datafeed_packet *packet,