[PATCH 5/9] Don't leak the buffer or temporary file used to save the dive

Thiago Macieira thiago at macieira.org
Wed Dec 11 17:56:31 UTC 2013


Signed-off-by: Thiago Macieira <thiago at macieira.org>
---
 qt-ui/subsurfacewebservices.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp
index 6be63fb..2b51da8 100644
--- a/qt-ui/subsurfacewebservices.cpp
+++ b/qt-ui/subsurfacewebservices.cpp
@@ -155,6 +155,8 @@ static char *prepare_dives_for_divelogs(const bool selected)
 		membuf = (char *)malloc(streamsize + 1);
 		if (!membuf || !fread(membuf, streamsize, 1, f)) {
 			qDebug() << errPrefix << "memory error";
+			fclose(f);
+			free((void *)membuf);
 			free((void *)tempfile);
 			return NULL;
 		}
@@ -168,6 +170,7 @@ static char *prepare_dives_for_divelogs(const bool selected)
 		doc = xmlReadMemory(membuf, strlen(membuf), "divelog", NULL, 0);
 		if (!doc) {
 			qDebug() << errPrefix << "xml error";
+			free((void *)membuf);
 			free((void *)tempfile);
 			return NULL;
 		}
-- 
1.7.11.7



More information about the subsurface mailing list