Branch 'libkolab-0.4' - kolabformat/v2helpers.cpp
Christian Mollekopf
mollekopf at kolabsys.com
Fri Feb 15 22:40:26 CET 2013
kolabformat/v2helpers.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit efd0f49d3a02d5d457b6afc1bf10fe9bcee9733d
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date: Fri Feb 15 22:38:04 2013 +0100
Got rid of another assert.
diff --git a/kolabformat/v2helpers.cpp b/kolabformat/v2helpers.cpp
index d023a6a..e679351 100644
--- a/kolabformat/v2helpers.cpp
+++ b/kolabformat/v2helpers.cpp
@@ -226,7 +226,10 @@ QStringList readLegacyDictionaryConfiguration(const QByteArray &xmlData, QString
{
QStringList dictionary;
const QDomDocument xmlDoc = KolabV2::KolabBase::loadDocument( QString::fromUtf8(xmlData) ); //TODO extract function from V2 format
- Q_ASSERT ( !xmlDoc.isNull() );
+ if ( xmlDoc.isNull() ) {
+ Error() << "Failed to read the xml document";
+ return QStringList();
+ }
QDomElement top = xmlDoc.documentElement();
More information about the commits
mailing list