aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Miika Turkia <miika.turkia@gmail.com>2015-09-08 20:12:29 +0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-09-09 03:05:54 -0700
commitce608b7ecf795865906082a5af89d724896d1dea (patch)
treebc18f54dc550755b2abbb05cea57a25a2dfecc34
parentaf541f7f6ace49e0758deff1a071dc6c2ebee756 (diff)
downloadsubsurface-ce608b7ecf795865906082a5af89d724896d1dea.tar.gz
Fix a crash on divelogs.de export
Subsurface crashes when multiple dives are selected on divelogs.de export. The crash occurs on malloc that is called indirectly from xmlReadMemory(). Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--qt-ui/subsurfacewebservices.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp
index 1722da4ce..e2e3b3e78 100644
--- a/qt-ui/subsurfacewebservices.cpp
+++ b/qt-ui/subsurfacewebservices.cpp
@@ -175,7 +175,6 @@ bool DivelogsDeWebServices::prepare_dives_for_divelogs(const QString &tempfile,
/* walk the dive list in chronological order */
int i;
struct dive *dive;
- struct membuffer mb = { 0 };
for_each_dive (i, dive) {
FILE *f;
char filename[PATH_MAX];
@@ -183,6 +182,7 @@ bool DivelogsDeWebServices::prepare_dives_for_divelogs(const QString &tempfile,
const char *membuf;
xmlDoc *transformed;
struct zip_source *s;
+ struct membuffer mb = { 0 };
/*
* Get the i'th dive in XML format so we can process it.