summaryrefslogtreecommitdiff
path: root/ext/mbstring/oniguruma/src/regext.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/mbstring/oniguruma/src/regext.c')
-rw-r--r--ext/mbstring/oniguruma/src/regext.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/mbstring/oniguruma/src/regext.c b/ext/mbstring/oniguruma/src/regext.c
index b83ae46586..de122c726e 100644
--- a/ext/mbstring/oniguruma/src/regext.c
+++ b/ext/mbstring/oniguruma/src/regext.c
@@ -171,9 +171,7 @@ onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end,
if (IS_NOT_NULL(einfo)) einfo->par = (UChar* )NULL;
if (ci->pattern_enc != ci->target_enc) {
- r = conv_encoding(ci->pattern_enc, ci->target_enc, pattern, pattern_end,
- &cpat, &cpat_end);
- if (r != 0) return r;
+ return ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION;
}
else {
cpat = (UChar* )pattern;