Check for valid version number during package collect.

Change-Id: I20a484beddc3ba00adb0b57e9bf0b9644252d28a
Reviewed-on: http://codereview.qt.nokia.com/4257
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/installerbuilder/common/repositorygen.cpp b/installerbuilder/common/repositorygen.cpp
index d799e58df..be4e5b9a4 100644
--- a/installerbuilder/common/repositorygen.cpp
+++ b/installerbuilder/common/repositorygen.cpp
@@ -102,6 +102,7 @@ static QVector<PackageInfo> collectAvailablePackages(const QString& packagesDire
         const QString name = doc.firstChildElement(QString::fromLatin1("Package"))
             .firstChildElement(QLatin1String("Name")).text();
         if (name != it->fileName()) {
+            verbose() << std::endl;
             throw QInstaller::Error(QObject::tr("Component folder name must match component name: "
                 "\"%1\" in %2/").arg(name, it->fileName()));
         }
@@ -110,6 +111,11 @@ static QVector<PackageInfo> collectAvailablePackages(const QString& packagesDire
         info.name = name;
         info.version = doc.firstChildElement(QString::fromLatin1("Package")).
             firstChildElement(QString::fromLatin1("Version")).text();
+        if (!QRegExp(QLatin1String("[0-9]+((\\.|-)[0-9]+)*")).exactMatch(info.version)) {
+            verbose() << std::endl;
+            throw QInstaller::Error(QObject::tr("Component version for %1 is invalid! <Version>%2</version>")
+                .arg(it->fileName(), info.version));
+        }
         info.dependencies = doc.firstChildElement(QString::fromLatin1("Package")).
             firstChildElement(QString::fromLatin1("Dependencies")).text().split(QRegExp(QLatin1String("\\b(,|, )\\b")),
             QString::SkipEmptyParts);