diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-14 18:45:03 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-30 10:38:48 +0200 |
commit | 67a101af142355a0ca7cdc234b7ee1716a25d87c (patch) | |
tree | 1e0c99bdd9667d24e71075192d8616a3f9c2f4c4 /src/qml/qml/qqmlimport.cpp | |
parent | 9ba195479ac3bc2c64d43ecf26f8c97e65483a5c (diff) |
Fix potential null pointer dereferencing
These were found by
http://www.viva64.com/en/b/025
most issues are rather cosmetic.
Change-Id: I7cc12610aae6a43d26bedb9b480863c0695ddfa3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlimport.cpp')
-rw-r--r-- | src/qml/qml/qqmlimport.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 5799886faa..bde61dca9d 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1851,17 +1851,21 @@ bool QQmlImportDatabase::registerPluginTypes(QObject *instance, const QString &b // This is an 'identified' module if (typeNamespace != uri) { // The namespace for type registrations must match the URI for locating the module - QQmlError error; - error.setDescription(tr("Module namespace '%1' does not match import URI '%2'").arg(typeNamespace).arg(uri)); - errors->prepend(error); + if (errors) { + QQmlError error; + error.setDescription(tr("Module namespace '%1' does not match import URI '%2'").arg(typeNamespace).arg(uri)); + errors->prepend(error); + } return false; } if (QQmlMetaType::namespaceContainsRegistrations(typeNamespace)) { // Other modules have already installed to this namespace - QQmlError error; - error.setDescription(tr("Namespace '%1' has already been used for type registration").arg(typeNamespace)); - errors->prepend(error); + if (errors) { + QQmlError error; + error.setDescription(tr("Namespace '%1' has already been used for type registration").arg(typeNamespace)); + errors->prepend(error); + } return false; } else { QQmlMetaType::protectNamespace(typeNamespace); |