From: Alex Dowad <alexinbeijing@gmail.com>
Date: Mon, 12 Oct 2020 18:52:52 +0000 (+0200)
Subject: Handle illegal bytes properly when converting to '7bit' encoding
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a98838e3b6370d21972a0a3a65eff2e9a52fd776;p=php

Handle illegal bytes properly when converting to '7bit' encoding

Previously, mbstring would silently drop illegal bytes when converting a
string to '7bit' encoding.
---

diff --git a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c
index 38956c1271..331dc8e743 100644
--- a/ext/mbstring/libmbfl/filters/mbfilter_7bit.c
+++ b/ext/mbstring/libmbfl/filters/mbfilter_7bit.c
@@ -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;
 }