utils: Fix removePath return value when path is not found

src/utils/Filename.cpp

@@ -151,7 +151,10 @@ std::string removePath( const std::string& fullPath, const std::string& toRemove
 {
     if ( toRemove.length() == 0 )
         return fullPath;
-    auto pos = fullPath.find( toRemove ) + toRemove.length();
+    auto pos = fullPath.find( toRemove );
+    if ( pos == std::string::npos )
+        return fullPath;
+    pos += toRemove.length();
     while ( fullPath[pos] == DIR_SEPARATOR
 #ifdef _WIN32
                 || fullPath[pos] == '/'

test/unittest/FsUtilsTests.cpp

@@ -93,6 +93,7 @@ TEST( FsUtils, removePath )
     ASSERT_EQ( "bar", utils::file::removePath( "bar", "" ) );
     ASSERT_EQ( "", utils::file::removePath( "bar/", "bar" ) );
     ASSERT_EQ( "", utils::file::removePath( "/f00/", "/f00/" ) );
+    ASSERT_EQ( "/f00", utils::file::removePath( "/f00", "/path/not/found" ) );
 }
 
 TEST( FsUtils, parentFolder )