Bugfixes for findInvalidChars (helper for mbstring test suite)

diff --git a/ext/mbstring/tests/encoding_tests.inc b/ext/mbstring/tests/encoding_tests.inc
index e95bc8fd09aa964a568e922fd58723f3476629f3..2993640c19d0005fc8dc0fe47735df329e6b9999 100644 (file)
--- a/ext/mbstring/tests/encoding_tests.inc
+++ b/ext/mbstring/tests/encoding_tests.inc
@@ -158,7 +158,7 @@ function findInvalidChars($valid, &$invalid, &$truncated, $startBytes = array())
             $prefixes[substr($char, 0, $len)] = true;
     }
 
-    $varLength = function($prefix) use($valid, &$invalid, &$truncated) {
+    $varLength = function($prefix) use($valid, $prefixes, &$invalid, &$truncated, &$varLength) {
         for ($byte = 0; $byte < 256; $byte++) {
             $str = $prefix . chr($byte);
             if (!isset($valid[$str])) {
@@ -172,7 +172,7 @@ function findInvalidChars($valid, &$invalid, &$truncated, $startBytes = array())
         }
     };
 
-    $fixedLength = function($prefix, $remaining) use($valid, &$invalid, &$truncated, &$fixedLength) {
+    $fixedLength = function($prefix, $remaining) use($valid, $prefixes, &$invalid, &$truncated, &$fixedLength) {
         if ($remaining == 0) {
             if (!isset($valid[$prefix]))
                 $invalid[$prefix] = true;