|
|
- From 0f7f61ed1b7b697e283e37bd2d731d0bd57adb55 Mon Sep 17 00:00:00 2001
- From: "K.Kosako" <kosako@sofnec.co.jp>
- Date: Thu, 27 Jun 2019 17:25:26 +0900
- Subject: [PATCH] Fix CVE-2019-13224: don't allow different encodings for
- onig_new_deluxe()
-
-
- diff --git a/src/regext.c b/src/regext.c
- index fa4b360..965c793 100644
- --- a/src/regext.c
- +++ b/src/regext.c
- @@ -29,6 +29,7 @@
-
- #include "regint.h"
-
- +#if 0
- static void
- conv_ext0be32(const UChar* s, const UChar* end, UChar* conv)
- {
- @@ -158,6 +159,7 @@ conv_encoding(OnigEncoding from, OnigEncoding to, const UChar* s, const UChar* e
-
- return ONIGERR_NOT_SUPPORTED_ENCODING_COMBINATION;
- }
- +#endif
-
- extern int
- onig_new_deluxe(regex_t** reg, const UChar* pattern, const UChar* pattern_end,
- @@ -169,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;
|
