summaryrefslogtreecommitdiff
path: root/btt/seek.c
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2011-12-16 13:15:54 -0600
committerJens Axboe <jaxboe@fusionio.com>2012-02-01 13:14:28 +0100
commit84b321fac4e417b1a1d91df1c5844a3c13ef53e5 (patch)
treea940a187ed7339148c4dc39ae79731f93ff4e8f7 /btt/seek.c
parent6ca1e530ba80c37dc9a686259fe643548ffce69c (diff)
downloadblktrace-84b321fac4e417b1a1d91df1c5844a3c13ef53e5.tar.gz
blktrace-84b321fac4e417b1a1d91df1c5844a3c13ef53e5.tar.bz2
Fix several leaks on error paths
In several cases space is allocated for a filename but not freed if open of that file fails. Signed-off-by: Eric Sandeen <sandeen@redhat.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'btt/seek.c')
-rw-r--r--btt/seek.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/btt/seek.c b/btt/seek.c
index abdb0ee..dba0071 100644
--- a/btt/seek.c
+++ b/btt/seek.c
@@ -51,9 +51,10 @@ static FILE *seek_open(char *str, char rw)
oname = malloc(strlen(seek_name) + strlen(str) + 32);
sprintf(oname, "%s_%s_%c.dat", seek_name, str, rw);
- if ((fp = my_fopen(oname, "w")) == NULL)
+ if ((fp = my_fopen(oname, "w")) == NULL) {
perror(oname);
- else
+ free(oname);
+ } else
add_file(fp, oname);
return fp;
@@ -226,9 +227,10 @@ void *seeki_alloc(struct d_info *dip, char *post)
oname = malloc(strlen(sps_name) + strlen(dip->dip_name) + 32);
sprintf(oname, "%s_%s.dat", sps_name, dip->dip_name);
- if ((sip->sps_fp = my_fopen(oname, "w")) == NULL)
+ if ((sip->sps_fp = my_fopen(oname, "w")) == NULL) {
perror(oname);
- else
+ free(oname);
+ } else
add_file(sip->sps_fp, oname);
} else
sip->sps_fp = NULL;