[[ Bug 16584 ]] Ensure source and pattern marks are in sync when wildcard matching

livecodeali · livecodeali · commit f4939bab50e2 · 2015-12-11T11:07:32.000Z
diff --git a/libfoundation/src/foundation-unicode.cpp b/libfoundation/src/foundation-unicode.cpp
@@ -2322,8 +2322,6 @@ bool MCUnicodeWildcardMatch(const void *source_chars, uindex_t source_length, bo
                 // try and match the rest of the source string recursively.
                 while (t_source_filter -> HasData())
                 {
-                    t_source_cp = t_source_filter -> GetNextCodepoint();
-                    
                     uindex_t t_sindex, t_pindex;
                     // if this is a candidate for a match, recurse.
                     if (t_source_cp == t_pattern_cp)
@@ -2355,6 +2353,7 @@ bool MCUnicodeWildcardMatch(const void *source_chars, uindex_t source_length, bo
                     
                     // if we don't find a match, eat the source codepoint and continue.
                     t_source_filter -> AdvanceCursor();
+                    t_source_cp = t_source_filter -> GetNextCodepoint();
                 }
             }
                 return false;

Original file line number	Diff line number	Diff line change
`@@ -2322,8 +2322,6 @@ bool MCUnicodeWildcardMatch(const void *source_chars, uindex_t source_length, bo`
`2322`	`2322`	`// try and match the rest of the source string recursively.`
`2323`	`2323`	`while (t_source_filter -> HasData())`
`2324`	`2324`	`{`
`2325`		`- t_source_cp = t_source_filter -> GetNextCodepoint();`
`2326`		`-`
`2327`	`2325`	`uindex_t t_sindex, t_pindex;`
`2328`	`2326`	`// if this is a candidate for a match, recurse.`
`2329`	`2327`	`if (t_source_cp == t_pattern_cp)`
`@@ -2355,6 +2353,7 @@ bool MCUnicodeWildcardMatch(const void *source_chars, uindex_t source_length, bo`
`2355`	`2353`
`2356`	`2354`	`// if we don't find a match, eat the source codepoint and continue.`
`2357`	`2355`	`t_source_filter -> AdvanceCursor();`
	`2356`	`+ t_source_cp = t_source_filter -> GetNextCodepoint();`
`2358`	`2357`	`}`
`2359`	`2358`	`}`
`2360`	`2359`	`return false;`