aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/gtls.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/gtls.c b/lib/gtls.c
index 002246a0c..d5c8f1a79 100644
--- a/lib/gtls.c
+++ b/lib/gtls.c
@@ -148,17 +148,22 @@ static gnutls_datum load_file (const char *file)
long filelen;
void *ptr;
- if (!(f = fopen(file, "r"))
- || fseek(f, 0, SEEK_END) != 0
+ if (!(f = fopen(file, "r")))
+ return loaded_file;
+ if (fseek(f, 0, SEEK_END) != 0
|| (filelen = ftell(f)) < 0
|| fseek(f, 0, SEEK_SET) != 0
- || !(ptr = malloc((size_t)filelen))
- || fread(ptr, 1, (size_t)filelen, f) < (size_t)filelen) {
- return loaded_file;
+ || !(ptr = malloc((size_t)filelen)))
+ goto out;
+ if (fread(ptr, 1, (size_t)filelen, f) < (size_t)filelen) {
+ free(ptr);
+ goto out;
}
loaded_file.data = ptr;
loaded_file.size = (unsigned int)filelen;
+out:
+ fclose(f);
return loaded_file;
}