]> sigrok.org Git - libsigrok.git/commitdiff
output/srzip: silence "use after free" compiler warning
authorGerhard Sittig <redacted>
Thu, 8 Feb 2018 21:06:53 +0000 (22:06 +0100)
committerUwe Hermann <redacted>
Fri, 9 Feb 2018 20:32:04 +0000 (21:32 +0100)
Defer memory g_free() until after the data gets accessed one last time.

This was reported by clang's scan-build.

src/output/srzip.c

index 249fe057994aeeaf80b9106ae3b041a8c1fb7b5e..6357a1c9072f7ddd5d9c4409bc456a8d78ab10f9 100644 (file)
@@ -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;