Replace HashTable

Thanks for advice nielsdos

Author: youkidearitai

ext/mbstring/mbstring.c

@@ -2947,14 +2947,9 @@ typedef enum {
 	MB_BOTH_TRIM = 3
 } MB_TRIM_MODE;
 
-static bool is_trim_wchar(uint32_t w, uint32_t *characters, size_t characters_len)
+static bool is_trim_wchar(uint32_t w, HashTable *ht)
 {
-	for (size_t i = 0; i < characters_len; i++) {
-		if (w == characters[i]) {
-			return true;
-		}
-	}
-	return false;
+	return zend_hash_index_exists(ht, w);
 }
 
 static zend_string* trim_each_wchar(zend_string *str, zend_string *what, MB_TRIM_MODE mode, const mbfl_encoding *enc)
@@ -2977,43 +2972,49 @@ static zend_string* trim_each_wchar(zend_string *str, zend_string *what, MB_TRIM
 		return zend_string_copy(str);
 	}
 
+	HashTable what_ht;
+	zval val;
+	zend_hash_init(&what_ht, what_len, NULL, NULL, false);
+
+	while (what_len) {
+		what_out_len = enc->to_wchar(&what_in, &what_len, what_wchar_buf, 128, &state);
+		ZEND_ASSERT(what_out_len <= 128);
+		for (size_t i = 0; i < what_out_len; i++) {
+			zend_hash_index_add_new(&what_ht, what_wchar_buf[i], &val);
+		}
+	}
+
 	while (in_len) {
 		out_len = enc->to_wchar(&in, &in_len, wchar_buf, 128, &state);
 		ZEND_ASSERT(out_len <= 128);
 		total_len += out_len;
 
-		while (what_len) {
-			what_out_len = enc->to_wchar(&what_in, &what_len, what_wchar_buf, 128, &state);
-			ZEND_ASSERT(what_out_len <= 128);
-
-			if (first && (mode & MB_LTRIM)) {
-				for (size_t i = 0; i < out_len; i++) {
-					uint32_t w = wchar_buf[i];
-					if (is_trim_wchar(w, what_wchar_buf, what_out_len)) {
-						left += 1;
-					} else {
-						first = false;
-						break;
-					}
+		if (first && (mode & MB_LTRIM)) {
+			for (size_t i = 0; i < out_len; i++) {
+				uint32_t w = wchar_buf[i];
+				if (is_trim_wchar(w, &what_ht)) {
+					left += 1;
+				} else {
+					first = false;
+					break;
 				}
 			}
+		}
 
-			if (mode & MB_RTRIM) {
-				for (size_t j = 0; j < out_len; j++) {
-					uint32_t w = wchar_buf[j];
-					if (is_trim_wchar(w, what_wchar_buf, what_out_len)) {
-						right -= 1;
-					} else {
-						right = 0;
-					}
+		if (mode & MB_RTRIM) {
+			for (size_t j = 0; j < out_len; j++) {
+				uint32_t w = wchar_buf[j];
+				if (is_trim_wchar(w, &what_ht)) {
+					right -= 1;
+				} else {
+					right = 0;
 				}
 			}
 		}
-
-		what_in -= ZSTR_LEN(what);
-		what_len = ZSTR_LEN(what);
 	}
 
+	zend_hash_destroy(&what_ht);
+
 	return mb_get_substr(str, left, total_len + (right - left), enc);
 }