summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortjenssen <tim.jenssen@nokia.com>2012-01-27 13:58:23 +0100
committerNiels Weber <niels.2.weber@nokia.com>2012-01-30 10:24:21 +0100
commit9461ae8db337ac68226530176692f4ee2b424668 (patch)
tree46c469c86218a7b779c9c547c83407a4f4513495
parent95323b8e7946f3d62b3e36ec9de630780321b03e (diff)
fix possible crash in
- findDisplayVersion shouldn't look for unavailable component in components hash Change-Id: I64fe9044e43678d0f98e0d470d73fa2ba4336ff2 Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
-rw-r--r--installerbuilder/libinstaller/packagemanagercore.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/installerbuilder/libinstaller/packagemanagercore.cpp b/installerbuilder/libinstaller/packagemanagercore.cpp
index a620867a2..8bcb3cdbf 100644
--- a/installerbuilder/libinstaller/packagemanagercore.cpp
+++ b/installerbuilder/libinstaller/packagemanagercore.cpp
@@ -1816,6 +1816,8 @@ void PackageManagerCore::updateDisplayVersions(const QString &displayKey)
QString PackageManagerCore::findDisplayVersion(const QString &componentName,
const QHash<QString, Component *> &components, const QString &versionKey, QHash<QString, bool> &visited)
{
+ if (!components.contains(componentName))
+ return QString();
const QString replaceWith = components.value(componentName)->value(scInheritVersion);
visited[componentName] = true;