diff options
author | Felix Geyer <debfx@fobos.de> | 2012-10-29 17:57:43 +0400 |
---|---|---|
committer | Felix Geyer <debfx@fobos.de> | 2012-10-29 18:01:53 +0400 |
commit | e92981b47608ae18f8045c845714f3837c69e6b1 (patch) | |
tree | 342f2f3202eaf194b8d8b5c5329e06194b976b6d /utils | |
parent | ac56ac98f7286ef7fe17a2483daf5261fd6c4802 (diff) |
kdbx-extract: Don't abort if parsing the XML data fails.
Diffstat (limited to 'utils')
-rw-r--r-- | utils/kdbx-extract.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/utils/kdbx-extract.cpp b/utils/kdbx-extract.cpp index 3c61d4367..402ceae63 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; } |