From 8762e5ce677c0e4b4aeba649b420f8fda8c57f0a Mon Sep 17 00:00:00 2001 From: npt-1707 Date: Tue, 15 Apr 2025 04:42:34 +0800 Subject: [PATCH] Fix CVE-2019-13224: don't allow different encodings for onig_new_deluxe() --- src/Onigmo/regext.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Onigmo/regext.c b/src/Onigmo/regext.c index 21ffd5a..28c6946 100644 --- a/src/Onigmo/regext.c +++ b/src/Onigmo/regext.c @@ -170,9 +170,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) return r; + return ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION; } else { cpat = (UChar* )pattern;