summaryrefslogtreecommitdiffstats
path: root/file.c
diff options
context:
space:
mode:
authorGravatar Miika Turkia <miika.turkia@gmail.com>2013-03-17 07:12:23 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-03-17 14:55:53 -0700
commita094b2b88a21a7161def15ad0a730f79a8c83f09 (patch)
tree96f41b4ff3c0a863281bdad11d852c085a8618ed /file.c
parent38d224a335cb9935d186b8b7ad0dc39c768e364f (diff)
downloadsubsurface-a094b2b88a21a7161def15ad0a730f79a8c83f09.tar.gz
Terminate decode at end of string and fix mem leak
Seems that we have to NULL terminate the buffer for xmlStringLenDecodeEntitites() as otherwise we might end up having extra data at the end of returned buffer. (Somehow the length parameter is not respected always, even if it is the proper size returned by the zip_fread() - header_skip). Also free the buffer returned by xmlStringLenDecodeEntitites(). Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'file.c')
-rw-r--r--file.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/file.c b/file.c
index b5fba301a..8deb2fe97 100644
--- a/file.c
+++ b/file.c
@@ -72,6 +72,7 @@ static void zip_read(struct zip_file *file, GError **error, const char *filename
size = read * 3 / 2;
mem = realloc(mem, size);
}
+ mem[read] = 0;
parse_xml_buffer(filename, mem, read, &dive_table, error);
free(mem);
}