Fixed incorporation of invalid characters in LIKE query

luciensadi · Jul 15, 2024 · fd8bcb6 · fd8bcb6
1 parent 83d6f4e
commit fd8bcb6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/act.informative.cpp b/src/act.informative.cpp
@@ -5538,7 +5538,10 @@ ACMD(do_index)
 }
 
 void display_help(char *help, int help_len, const char *arg, struct char_data *ch) {
-  char query[MAX_STRING_LENGTH], prepared_standard[MAX_STRING_LENGTH], prepared_for_like[MAX_STRING_LENGTH];
+  char query[MAX_STRING_LENGTH] = { 0 };
+  char prepared_standard[MAX_STRING_LENGTH] = { 0 };
+  char prepared_for_like[MAX_STRING_LENGTH] = { 0 };
+
   MYSQL_RES *res;
   MYSQL_ROW row;
   *help = '\0';

diff --git a/src/newdb.cpp b/src/newdb.cpp
@@ -250,8 +250,11 @@ char *prepare_quotes(char *dest, const char *str, size_t size_of_dest, bool incl
       *temp++ = '\\';
     }
     // Special case handling: % has special meaning in LIKE statements.
-    if (is_like && *str == '%') {
-      *temp++ = '\\';
+    if (is_like) {
+      if (*str == '%' || *str == '?' || *str == '.' || *str == '*' || *str == '+' || *str == '(' || *str == ')' || *str == '[' || *str == ']') {
+        *temp++ = '\\';
+        *temp++ = '\\';
+      }
     }
     *temp++ = *str++;
   }

diff --git a/src/spec_assign.cpp b/src/spec_assign.cpp
@@ -1225,6 +1225,7 @@ void assign_rooms(void)
   ASSIGNROOM(15600, troll_barrier);
   ASSIGNROOM(8901, car_dealer);
   ASSIGNROOM(8903, car_dealer);
+  ASSIGNROOM(100203, car_dealer);
 
   // Cairo's room
   ASSIGNROOM(RM_CAIROS_APARTMENT, floor_has_glass_shards);