mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

parser: XML_PARSE_RECOVER to xmlReadMemory()

Browse source 
Due to changes in the handling of sensor-ids, invalid XMLs were
generated. In particular, these contained duplicate attributes
in the sample tags.

Even though these files shouldn't exist, let's try to parse
them anyway. Some data will be lost, but that's better than
not opening the file.

libxml2 can be told to try to recover from such petty(?) errors
by passing the XML_PARSE_RECOVER flag.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-09-02 09:05:31 +02:00 committed by Dirk Hohndel
parent 836111da98
commit 5eda1c0e39
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/parse-xml.c
View file

@ -1745,9 +1745,9 @@ int parse_xml_buffer(const char *url, const char *buffer, int size,
state.sites = sites; state.sites = sites;
state.devices = devices; state.devices = devices;
state.filter_presets = filter_presets; state.filter_presets = filter_presets;
doc = xmlReadMemory(res, strlen(res), url, NULL, XML_PARSE_HUGE); doc = xmlReadMemory(res, strlen(res), url, NULL, XML_PARSE_HUGE | XML_PARSE_RECOVER);
if (!doc) if (!doc)
doc = xmlReadMemory(res, strlen(res), url, "latin1", XML_PARSE_HUGE); doc = xmlReadMemory(res, strlen(res), url, "latin1", XML_PARSE_HUGE | XML_PARSE_RECOVER);
if (res != buffer) if (res != buffer)
free((char *)res); free((char *)res);

2
core/save-xml.c
View file

@ -865,7 +865,7 @@ static int export_dives_xslt_doit(const char *filename, struct xml_params *param
* transform it to selected export format, finally dumping * transform it to selected export format, finally dumping
* the XML into a character buffer. * the XML into a character buffer.
*/ */
doc = xmlReadMemory(buf.buffer, buf.len, "divelog", NULL, XML_PARSE_HUGE); doc = xmlReadMemory(buf.buffer, buf.len, "divelog", NULL, XML_PARSE_HUGE | XML_PARSE_RECOVER);
free_buffer(&buf); free_buffer(&buf);
if (!doc) if (!doc)
return report_error("Failed to read XML memory"); return report_error("Failed to read XML memory");

2
core/uploadDiveLogsDE.cpp
View file

@ -142,7 +142,7 @@ bool uploadDiveLogsDE::prepareDives(const QString &tempfile, bool selected)
* transform it to divelogs.de format, finally dumping * transform it to divelogs.de format, finally dumping
* the XML into a character buffer. * the XML into a character buffer.
*/ */
xmlDoc *doc = xmlReadMemory(mb.buffer, mb.len, "divelog", NULL, 0); xmlDoc *doc = xmlReadMemory(mb.buffer, mb.len, "divelog", NULL, XML_PARSE_HUGE | XML_PARSE_RECOVER);
if (!doc) { if (!doc) {
qWarning() << errPrefix << "could not parse back into memory the XML file we've just created!"; qWarning() << errPrefix << "could not parse back into memory the XML file we've just created!";
report_error(tr("internal error").toUtf8()); report_error(tr("internal error").toUtf8());