]> granicus.if.org Git - php/commitdiff
Handle illegal bytes properly when converting to '7bit' encoding
authorAlex Dowad <alexinbeijing@gmail.com>
Mon, 12 Oct 2020 18:52:52 +0000 (20:52 +0200)
committerAlex Dowad <alexinbeijing@gmail.com>
Tue, 13 Oct 2020 04:12:38 +0000 (06:12 +0200)
Previously, mbstring would silently drop illegal bytes when converting a
string to '7bit' encoding.

ext/mbstring/libmbfl/filters/mbfilter_7bit.c

index 38956c12710a2acca6703b9bfe97c75f5799bdd4..331dc8e743cf5d1a524c7a252a4208bc2d0004fe 100644 (file)
@@ -83,6 +83,8 @@ int mbfl_filt_conv_any_7bit(int c, mbfl_convert_filter *filter)
 {
        if (c >= 0 && c < 0x80) {
                CK((*filter->output_function)(c, filter->data));
+       } else {
+               mbfl_filt_conv_illegal_output(c, filter);
        }
        return c;
 }