adding more checks to method

MerginMaps · Jul 24, 2024 · ff78037 · ff78037 · inputapp-bot · Jul 24, 2024
1 parent 0f8a801
commit ff78037
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/core/merginapi.cpp b/core/merginapi.cpp
@@ -1591,13 +1591,22 @@ ProjectDiff MerginApi::localProjectChanges( const QString &projectDir )
 
 bool MerginApi::parseVersion( const QString &version, int &major, int &minor )
 {
+  if ( version.isNull() || version.isEmpty() )
+    return false;
+
   QRegularExpression re;
-  re.setPattern( QStringLiteral( "(?<major>\\d+)[.](?<minor>\\d+)" ) );
+  re.setPattern( QStringLiteral( R"((?<major>\d+)\.(?<minor>\d+))" ) );
   QRegularExpressionMatch match = re.match( version );
+
   if ( match.hasMatch() )
   {
-    major = match.captured( "major" ).toInt();
-    minor = match.captured( "minor" ).toInt();
+    bool majorOk, minorOk;
+    major = match.captured( "major" ).toInt( &majorOk );
+    minor = match.captured( "minor" ).toInt( &minorOk );
+
+    if ( !majorOk || !minorOk )
+      return false;
+
     return true;
   }