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

[libsigrok.git] / src / output / srzip.c

diff --git a/src/output/srzip.c b/src/output/srzip.c
index b554558534a3587bf81d99d4e691f5b3ad03cc6e..6357a1c9072f7ddd5d9c4409bc456a8d78ab10f9 100644 (file)
--- a/src/output/srzip.c
+++ b/src/output/srzip.c
@@ -260,8 +260,11 @@ static int zip_append(const struct sr_output *o, unsigned char *buf,
                if (!entry_name || strncmp(entry_name, "logic-1", 7) != 0)
                        continue;
                if (entry_name[7] == '\0') {
-                       /* This file has no extra chunks, just a single "logic-1".
-                        * Rename it to "logic-1-1" * and continue with chunk 2. */
+                       /*
+                        * This file has no extra chunks, just a single
+                        * "logic-1". Rename it to "logic-1-1" and continue
+                        * with chunk 2.
+                        */
                        if (zip_rename(archive, i, "logic-1-1") < 0) {
                                sr_err("Failed to rename 'logic-1' to 'logic-1-1': %s",
                                        zip_strerror(archive));
@@ -339,7 +342,7 @@ static int zip_append_analog(const struct sr_output *o,
                if (outc->analog_index_map[index] == channel->index)
                        break;
        if (outc->analog_index_map[index] == -1)
-               return SR_ERR_ARG;  /* Channel index was not in the list */
+               return SR_ERR_ARG; /* Channel index was not in the list */
 
        index += outc->first_analog_index;
 
@@ -376,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;