mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: replace membuffer by membufferpp in C-code

Browse source 
Thus, the membuffer data is automatically freed when going
out of scope - one thing less to worry about.

This fixes one use-after-free bug in uploadDiveLogsDE.cpp
and one extremely questionable practice in divetooltipitem.cpp:
The membuffer was a shared instance across all instances
of the DiveToolTipItem.

Remves unnecessary #include directives in files that didn't
even use membuffer.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-07-20 07:45:31 +02:00 • committed by Dirk Hohndel
parent f142e9a9c6
commit 16b31985c3
9 changed files with 9 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
core/divesitehelpers.cpp
View file

@ -9,7 +9,6 @@
#include "errorhelper.h"
#include "subsurface-string.h"
#include "qthelper.h"
#include "membuffer.h"
#include <QDebug>
#include <QJsonDocument>
#include <QJsonArray>

1
core/qthelper.cpp
View file

@ -7,7 +7,6 @@
#include "subsurface-string.h"
#include "gettextfromc.h"
#include "statistics.h"
#include "membuffer.h"
#include "version.h"
#include "errorhelper.h"
#include "planner.h"

9
core/uploadDiveLogsDE.cpp
View file

@ -97,7 +97,7 @@ bool uploadDiveLogsDE::prepareDives(const QString &tempfile, bool selected)
const char *membuf;
xmlDoc *transformed;
struct zip_source *s;
struct membuffer mb = {};
struct membufferpp mb;
struct xml_params *params = alloc_xml_params();
/*
@ -109,9 +109,7 @@ bool uploadDiveLogsDE::prepareDives(const QString &tempfile, bool selected)
continue;
}
/* make sure the buffer is empty and add the dive */
mb.len = 0;
/* add the dive */
struct dive_site *ds = dive->dive_site;
if (ds) {
@ -140,7 +138,7 @@ bool uploadDiveLogsDE::prepareDives(const QString &tempfile, bool selected)
put_format(&mb, "</divelog>\n");
}
membuf = mb_cstring(&mb);
streamsize = strlen(membuf);
streamsize = mb.len;
/*
* Parse the memory buffer into XML document and
* transform it to divelogs.de format, finally dumping
@ -156,7 +154,6 @@ bool uploadDiveLogsDE::prepareDives(const QString &tempfile, bool selected)
free_xml_params(params);
return false;
}
free_buffer(&mb);
xml_params_add_int(params, "allcylinders", prefs.display_unused_tanks);
transformed = xsltApplyStylesheet(xslt, doc, xml_params_get(params));

3
core/uploadDiveShare.cpp
View file

@ -27,10 +27,9 @@ uploadDiveShare::uploadDiveShare():
void uploadDiveShare::doUpload(bool selected, const QString &uid, bool noPublic)
{
//generate json
struct membuffer buf = {};
struct membufferpp buf;
export_list(&buf, NULL, selected, false);
QByteArray json_data(buf.buffer, buf.len);
free_buffer(&buf);
//Request to server
QNetworkRequest request;