diff options
author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-08-17 21:46:30 +0000 |
---|---|---|
committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-08-17 21:46:30 +0000 |
commit | e990a6e7cbe72463a69aec037f7ede9facb716da (patch) | |
tree | 69b9f1aba42e8a0ef697b618462ecc391e810613 /user/oniguruma/CVE-2019-13224.patch | |
parent | 20aab3bf93e67dea45c5658149f77ee6fd00110f (diff) | |
download | packages-e990a6e7cbe72463a69aec037f7ede9facb716da.tar.gz packages-e990a6e7cbe72463a69aec037f7ede9facb716da.tar.bz2 packages-e990a6e7cbe72463a69aec037f7ede9facb716da.tar.xz packages-e990a6e7cbe72463a69aec037f7ede9facb716da.zip |
user/oniguruma: bump to 6.9.3
Diffstat (limited to 'user/oniguruma/CVE-2019-13224.patch')
-rw-r--r-- | user/oniguruma/CVE-2019-13224.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/user/oniguruma/CVE-2019-13224.patch b/user/oniguruma/CVE-2019-13224.patch deleted file mode 100644 index 22bc6bd2f..000000000 --- a/user/oniguruma/CVE-2019-13224.patch +++ /dev/null @@ -1,41 +0,0 @@ -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() - ---- - src/regext.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -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; |