[Valgrind] Fix buffer overflow in Unicode wildcard matching.

peter-b · peter-b · commit 036843f27ff1 · 2016-10-04T22:07:34.000+01:00
Check that both pattern and source buffers have more contents before
reading from them both.
diff --git a/libfoundation/src/foundation-unicode.cpp b/libfoundation/src/foundation-unicode.cpp
@@ -2239,7 +2239,7 @@ bool MCUnicodeWildcardMatch(const void *source_chars, uindex_t source_length, bo
     
     codepoint_t t_source_cp, t_pattern_cp;
     
-    while (t_source_filter -> HasData())
+    while (t_source_filter -> HasData() && t_pattern_filter -> HasData())
     {
         t_source_cp = t_source_filter -> GetNextCodepoint();
         t_pattern_cp = t_pattern_filter -> GetNextCodepoint();

Original file line number	Diff line number	Diff line change
`@@ -2239,7 +2239,7 @@ bool MCUnicodeWildcardMatch(const void *source_chars, uindex_t source_length, bo`
`2239`	`2239`
`2240`	`2240`	`codepoint_t t_source_cp, t_pattern_cp;`
`2241`	`2241`
`2242`		`- while (t_source_filter -> HasData())`
	`2242`	`+ while (t_source_filter -> HasData() && t_pattern_filter -> HasData())`
`2243`	`2243`	`{`
`2244`	`2244`	`t_source_cp = t_source_filter -> GetNextCodepoint();`
`2245`	`2245`	`t_pattern_cp = t_pattern_filter -> GetNextCodepoint();`