mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
776296e12f
Previously, mbstring had a special mode whereby it would convert
erroneous input byte sequences to output like "BAD+XXXX", where "XXXX"
would be the erroneous bytes expressed in hexadecimal. This mode could
be enabled by calling `mb_substitute_character("long")`.
However, accurately reproducing input byte sequences from the cached
state of a conversion filter is often tricky, and this significantly
complicates the implementation. Further, the means used for passing
the erroneous bytes through to where the "BAD+XXXX" text is generated
only allows for up to 3 bytes to be passed, meaning that some erroneous
byte sequences are truncated anyways.
More to the point, a search of publically available PHP code indicates
that nobody is really using this feature anyways.
Incidentally, this feature also provided error output like "JIS+XXXX"
if the input 'should have' represented a JISX 0208 codepoint, but it
decodes to a codepoint which does not exist in the JISX 0208 charset.
Similarly, specific error output was provided for non-existent
JISX 0212 codepoints, and likewise for JISX 0213, CP932, and a few
other charsets. All of that is now consigned to the flames.
However, "long" error markers also include a somewhat more useful
"U+XXXX" marker for Unicode codepoints which were successfully
decoded from the input text, but cannot be represented in the output
encoding. Those are still supported.
With this change, there is no need to use a variety of special values
in the high bits of a wchar to represent different types of error
values. We can (and will) just use a single error value. This will be
equal to -1.
One complicating factor: Text conversion functions return an integer to
indicate whether the conversion operation should be immediately
aborted, and the magic 'abort' marker is -1. Also, almost all of these
functions would return the received byte/codepoint to indicate success.
That doesn't work with the new error value; if an input filter detects
an error and passes -1 to the output filter, and the output filter
returns it back, that would be taken to mean 'abort'.
Therefore, amend all these functions to return 0 for success.
86 lines
3.1 KiB
PHP
86 lines
3.1 KiB
PHP
--TEST--
|
|
Exhaustive test of EUC-JP-2004 encoding verification and conversion
|
|
--EXTENSIONS--
|
|
mbstring
|
|
--SKIPIF--
|
|
<?php
|
|
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
|
|
?>
|
|
--FILE--
|
|
<?php
|
|
srand(200); /* Make results consistent */
|
|
include('encoding_tests.inc');
|
|
mb_substitute_character(0x25); // '%'
|
|
|
|
$validChars = array(); /* EUC-JP-2004 string -> UTF-32BE */
|
|
$fromUnicode = array(); /* UTF-16BE -> EUC-JP-2004 */
|
|
$fp = fopen(__DIR__ . '/data/EUC-JP-2004.txt', 'r+');
|
|
while ($line = fgets($fp, 256)) {
|
|
if ($line[0] == '#')
|
|
continue;
|
|
|
|
$codepoint2 = null;
|
|
if (sscanf($line, "0x%x\tU+%x+%x", $bytes, $codepoint1, $codepoint2) >= 2) {
|
|
if ($bytes < 256)
|
|
$eucjp = chr($bytes);
|
|
else if ($bytes <= 0xFFFF)
|
|
$eucjp = pack('n', $bytes);
|
|
else
|
|
$eucjp = chr($bytes >> 16) . pack('n', $bytes & 0xFFFF);
|
|
|
|
if ($codepoint2) {
|
|
$validChars[$eucjp] = pack('NN', $codepoint1, $codepoint2);
|
|
} else {
|
|
$validChars[$eucjp] = pack('N', $codepoint1);
|
|
if ($codepoint1 <= 0xFFFF)
|
|
$fromUnicode[pack('n', $codepoint1)] = $eucjp;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Convert 0xA1B1 to U+FFE3 (FULLWIDTH MACRON), not U+203E (OVERLINE) */
|
|
$validChars["\xA1\xB1"] = "\x00\x00\xFF\xE3";
|
|
$fromUnicode["\xFF\xE3"] = "\xA1\xB1";
|
|
|
|
/* Convert 0xA1EF to U+FFE5 (FULLWIDTH YEN SIGN), not U+00A5 (YEN SIGN) */
|
|
$validChars["\xA1\xEF"] = "\x00\x00\xFF\xE5";
|
|
$fromUnicode["\xFF\xE5"] = "\xA1\xEF";
|
|
|
|
/* Convert U+00A5 (YEN SIGN) to 0x5C; that is one of the single bytes
|
|
* which many legacy Japanese text encodings used to represent something
|
|
* different from its normal meaning ASCII. In ASCII it's a backslash,
|
|
* but legacy Japanese software often used it for a yen sign. */
|
|
$fromUnicode["\x00\xA5"] = "\x5C";
|
|
/* The other one is 0x7E, which is a tilde in ASCII, but was used in
|
|
* legacy Japanese software for an overline */
|
|
$fromUnicode["\x20\x3E"] = "\x7E";
|
|
|
|
testAllValidChars($validChars, 'EUC-JP-2004', 'UTF-32BE');
|
|
echo "EUC-JP-2004 verification and conversion works for all valid characters\n";
|
|
|
|
findInvalidChars($validChars, $invalidChars, $truncated);
|
|
testAllInvalidChars($invalidChars, $validChars, 'EUC-JP-2004', 'UTF-32BE', "\x00\x00\x00%");
|
|
testTruncatedChars($truncated, 'EUC-JP-2004', 'UTF-32BE', "\x00\x00\x00%");
|
|
echo "EUC-JP-2004 verification and conversion rejects all invalid characters\n";
|
|
|
|
testAllValidChars($fromUnicode, 'UTF-16BE', 'EUC-JP-2004', false);
|
|
echo "Unicode -> EUC-JP-2004 conversion works on all valid characters\n";
|
|
|
|
findInvalidChars($fromUnicode, $invalidChars, $unused, array_fill_keys(range(0, 0xFF), 2));
|
|
convertAllInvalidChars($invalidChars, $fromUnicode, 'UTF-16BE', 'EUC-JP-2004', '%');
|
|
echo "Unicode -> EUC-JP-2004 conversion works on all invalid characters\n";
|
|
|
|
// Test "long" illegal character markers
|
|
mb_substitute_character("long");
|
|
convertInvalidString("\x80", "%", "EUC-JP-2004", "UTF-8");
|
|
convertInvalidString("\xFE\xFF", "%", "EUC-JP-2004", "UTF-8");
|
|
|
|
echo "Done!\n";
|
|
?>
|
|
--EXPECT--
|
|
EUC-JP-2004 verification and conversion works for all valid characters
|
|
EUC-JP-2004 verification and conversion rejects all invalid characters
|
|
Unicode -> EUC-JP-2004 conversion works on all valid characters
|
|
Unicode -> EUC-JP-2004 conversion works on all invalid characters
|
|
Done!
|