Fix two bugs in wildcard match

Two or more consecutive * characters were not handled. A fix was on the
web site this code comes from.

Before calling wildMatch recursively with "str + 1", the code did not
check whether *str was zero, in which case the "str + 1" is illegal.

This also changes the names of the function parameters which were not
consistent in .hpp and .cpp files.

Author: joto

src/wildcmp.cpp

@@ -15,28 +15,37 @@
  * Case sensitive wild card match with a string.
  * * matches any string or no character.
  * ? matches any single character.
- * anything else etc must match the character exactly.
+ * anything else must match the character exactly.
  *
  * Returns if a match was found.
  */
-bool wildMatch(char const *first, char const *second)
+bool wildMatch(char const *expr, char const *str) noexcept
 {
-    // Code borrowed from
+    // Code based on
     // http://www.geeksforgeeks.org/wildcard-character-matching/
-    if (*first == '\0' && *second == '\0') {
+    if (*expr == '\0' && *str == '\0') {
         return true;
     }
 
-    if (*first == '*' && *(first + 1) != '\0' && *second == '\0') {
+    if (*expr == '*') {
+        while (*(expr + 1) == '*') {
+            ++expr;
+        }
+    }
+
+    if (*expr == '*' && *(expr + 1) != '\0' && *str == '\0') {
         return false;
     }
 
-    if (*first == '?' || *first == *second) {
-        return wildMatch(first + 1, second + 1);
+    if (*expr == '?' || *expr == *str) {
+        if (*str == '\0') {
+            return false;
+        }
+        return wildMatch(expr + 1, str + 1);
     }
 
-    if (*first == '*') {
-        return wildMatch(first + 1, second) || wildMatch(first, second + 1);
+    if (*expr == '*') {
+        return wildMatch(expr + 1, str) || wildMatch(expr, str + 1);
     }
 
     return false;

src/wildcmp.hpp

@@ -10,6 +10,6 @@
  * For a full list of authors see the git log.
  */
 
-bool wildMatch(char const *wildCard, char const *string);
+bool wildMatch(char const *expr, char const *str) noexcept;
 
 #endif // OSM2PGSQL_WILDCMP_HPP

tests/test-wildcard-match.cpp

@@ -17,14 +17,17 @@ TEST_CASE("Wildcard matching", "[NoDB]")
     CHECK_FALSE(wildMatch("fhwieurwe", "fhwieurw"));
     CHECK_FALSE(wildMatch("fhwieurw", "fhwieurwe"));
     CHECK(wildMatch("*", "foo"));
+    CHECK(wildMatch("**", "foo"));
     CHECK_FALSE(wildMatch("r*", "foo"));
     CHECK(wildMatch("r*", "roo"));
     CHECK(wildMatch("*bar", "Hausbar"));
     CHECK_FALSE(wildMatch("*bar", "Haustar"));
     CHECK(wildMatch("*", ""));
+    CHECK(wildMatch("**", ""));
     CHECK(wildMatch("kin*la", "kinla"));
     CHECK(wildMatch("kin*la", "kinLLla"));
     CHECK(wildMatch("kin*la", "kinlalalala"));
+    CHECK(wildMatch("kin**la", "kinlalalala"));
     CHECK_FALSE(wildMatch("kin*la", "kinlaa"));
     CHECK_FALSE(wildMatch("kin*la", "ki??laa"));
     CHECK(wildMatch("1*2*3", "123"));
@@ -35,4 +38,6 @@ TEST_CASE("Wildcard matching", "[NoDB]")
     CHECK_FALSE(wildMatch("bo??f", "boxf"));
     CHECK(wildMatch("?5?", "?5?"));
     CHECK(wildMatch("?5?", "x5x"));
+    CHECK_FALSE(wildMatch("?abc", ""));
+    CHECK_FALSE(wildMatch("?", ""));
 }