From e92981b47608ae18f8045c845714f3837c69e6b1 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Mon, 29 Oct 2012 14:57:43 +0100 Subject: [PATCH] kdbx-extract: Don't abort if parsing the XML data fails. --- utils/kdbx-extract.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/utils/kdbx-extract.cpp b/utils/kdbx-extract.cpp index 3c61d436..402ceae6 100644 --- a/utils/kdbx-extract.cpp +++ b/utils/kdbx-extract.cpp @@ -65,13 +65,20 @@ int main(int argc, char **argv) reader.setSaveXml(true); reader.readDatabase(&dbFile, key); + QByteArray xmlData = reader.xmlData(); + if (reader.hasError()) { - qCritical("Error while reading the database:\n%s", qPrintable(reader.errorString())); - return 1; + if (xmlData.isEmpty()) { + qCritical("Error while reading the database:\n%s", qPrintable(reader.errorString())); + return 1; + } + else { + qWarning("Error while parsing the database:\n%s\n", qPrintable(reader.errorString())); + } } QTextStream out(stdout); - out << reader.xmlData().constData() << "\n"; + out << xmlData.constData() << "\n"; return 0; }