BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

srzip: zip_append_analog(): Fix memory leaks 

zip_append_analog() does not free most of the memory it allocates. Address
this by moving all sanity checks that do not rely on anything else at the
beginning of the function before any allocations are done. And then make
sure to properly free all allocated memory on all paths leaving the
function.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
This commit is contained in:
Lars-Peter Clausen 2016-04-28 17:44:29 +02:00 committed by Uwe Hermann
parent 9906dbf5a4
commit 7e2f42214a
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/output/srzip.c
View File

@ -324,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) {
@ -351,6 +343,14 @@ static int zip_append_analog(const struct sr_output *o,
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;
@ -368,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);
@ -379,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,