App: fix crash due to incorrect usage of std::mismatch

FreeCAD · Aug 22, 2020 · bf1e8e4 · bf1e8e4
1 parent 4b7e643
commit bf1e8e4
Showing 1 changed file with 25 additions and 34 deletions.
diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp
@@ -2463,22 +2463,19 @@ class App::DocInfo :
             const char *filename, App::Document *pDoc, bool relative, QString *fullPath = 0) 
     {
         bool absolute;
-       // The path could be an URI, in that case
-       // TODO: build a far much more resilient approach to test for an URI
-       std::string prefix("https://");
-       std::string FileName(filename);
-       auto res = std::mismatch(prefix.begin(), prefix.end(), FileName.begin());
-       if ( res.first == prefix.end() )
-       {
-               // We do have an URI
-               QString path = QString::fromUtf8(filename);
-               if ( fullPath )
-                       *fullPath = path;
+        // The path could be an URI, in that case
+        // TODO: build a far much more resilient approach to test for an URI
+        QString path = QString::fromUtf8(filename);
+        if (path.startsWith(QLatin1String("https://"))) {
+            // We do have an URI
+            if (fullPath)
+                *fullPath = path;
                return std::string(filename);
-       }
+        }
+
         // make sure the filename is aboluste path
-        QString path = QDir::cleanPath(QString::fromUtf8(filename));
-        if((absolute=QFileInfo(path).isAbsolute())) {
+        path = QDir::cleanPath(path);
+        if((absolute = QFileInfo(path).isAbsolute())) {
             if(fullPath)
                 *fullPath = path;
             if(!relative)
@@ -2547,28 +2544,22 @@ class App::DocInfo :
     }
 
     static QString getFullPath(const char *p) {
-       QString path = QString::fromUtf8(p);;
-       std::string prefix("https://");
-       std::string Path(path.toStdString());
-       auto res = std::mismatch(prefix.begin(), prefix.end(), Path.begin());
-       if ( res.first == prefix.end() )
-		return(path);
-	else
-	{
-        	if(!p) return QString();
- 	   	return QFileInfo(QString::fromUtf8(p)).canonicalFilePath();
-	}
-     }
+        QString path = QString::fromUtf8(p);
+        if (path.isEmpty())
+            return path;
+
+        if (path.startsWith(QLatin1String("https://")))
+            return path;
+        else
+            return QFileInfo(path).canonicalFilePath();
+    }
 
     QString getFullPath() const {
-       QString path = myPos->first;
-       std::string prefix("https://");
-       std::string Path(path.toStdString());
-       auto res = std::mismatch(prefix.begin(), prefix.end(), Path.begin());
-       if ( res.first == prefix.end() )
-		return(path);
-       else
-		return QFileInfo(myPos->first).canonicalFilePath();
+        QString path = myPos->first;
+        if (path.startsWith(QLatin1String("https://")))
+            return path;
+        else
+            return QFileInfo(myPos->first).canonicalFilePath();
     }
 
     const char *filePath() const {