Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ext/mbstring/libmbfl/mbfl/mbfl_convert.c
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,8 @@ const struct mbfl_convert_vtbl* mbfl_convert_filter_get_vtbl(const mbfl_encoding
from = &mbfl_encoding_8bit;
} else if (from->no_encoding == mbfl_no_encoding_base64 ||
from->no_encoding == mbfl_no_encoding_qprint ||
from->no_encoding == mbfl_no_encoding_uuencode) {
from->no_encoding == mbfl_no_encoding_uuencode ||
from->no_encoding == mbfl_no_encoding_7bit) {
to = &mbfl_encoding_8bit;
}

Expand Down
10 changes: 10 additions & 0 deletions ext/mbstring/tests/bug81693.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--TEST--
Bug #81693 (mb_check_encoding(7bit) segfaults)
--EXTENSIONS--
mbstring
--FILE--
<?php
var_dump(mb_check_encoding('Hello world', '7bit'));
?>
--EXPECT--
bool(true)