rpms/oniguruma
7
0
Fork 0
Code Issues Pull Requests Releases Activity

6.9.2 rc4

Browse Source
This commit is contained in:
Mamoru TASAKA 2020-10-21 23:31:01 +09:00
parent 26779ee860
commit 35fac660e0
4 changed files with 7 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -27,3 +27,4 @@ onig-5.9.2.tar.gz
/onig-6.9.5-rev1.tar.gz
/onig-6.9.6-rc2.tar.gz
/onig-6.9.6-rc3.tar.gz
/onig-6.9.6-rc4.tar.gz

32
oniguruma-6.9.6-upstream-bug221.patch
View File

@ -1,32 +0,0 @@
From 3603d78f0a3dc80e4d450509120c26a5ffcd293b Mon Sep 17 00:00:00 2001
From: "K.Kosako" <kkosako0@gmail.com>
Date: Tue, 20 Oct 2020 11:52:27 +0900
Subject: [PATCH] #221: revert cbe9f8b and 8155473: Out-of-bounds write in #207
(Issues found with Coverity) is fake
---
src/regcomp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/regcomp.c b/src/regcomp.c
index 30b982bb..7aee715f 100644
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -6238,7 +6238,7 @@ concat_opt_exact(OptStr* to, OptStr* add, OnigEncoding enc)
end = p + add->len;
for (i = to->len; p < end; ) {
len = enclen(enc, p);
- if (i + len >= OPT_EXACT_MAXLEN) {
+ if (i + len > OPT_EXACT_MAXLEN) {
r = 1; /* 1:full */
break;
}
@@ -6264,7 +6264,7 @@ concat_opt_exact_str(OptStr* to, UChar* s, UChar* end, OnigEncoding enc)
for (i = to->len, p = s; p < end && i < OPT_EXACT_MAXLEN; ) {
len = enclen(enc, p);
- if (i + len >= OPT_EXACT_MAXLEN) break;
+ if (i + len > OPT_EXACT_MAXLEN) break;
for (j = 0; j < len && p < end; j++)
to->s[i++] = *p++;
}

11
oniguruma.spec
View File

@ -1,10 +1,10 @@
%undefine _changelog_trimtime
%global mainver 6.9.6
%global betaver rc3
%global betaver rc4
%define prerelease 1
%global fedorarel 3
%global fedorarel 4
Name: oniguruma
Version: %{mainver}
@ -14,9 +14,6 @@ Summary: Regular expressions library
License: BSD
URL: https://github.com/kkos/oniguruma/
Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?betaver:-%betaver}.tar.gz
# https://github.com/kkos/oniguruma/issues/221
# https://github.com/kkos/oniguruma/commit/3603d78f0a3dc80e4d450509120c26a5ffcd293b
Patch0: oniguruma-6.9.6-upstream-bug221.patch
BuildRequires: gcc
@ -38,7 +35,6 @@ developing applications that use %{name}.
%prep
%setup -q -n onig-%{mainver}
%patch0 -p1 -b .up221
%{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in
@ -104,6 +100,9 @@ find $RPM_BUILD_ROOT -name '*.la' \
%{_libdir}/pkgconfig/%{name}.pc
%changelog
* Wed Oct 21 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.6-0.4.rc4
- 6.9.2 rc4
* Tue Oct 20 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.6-0.3.rc3
- Apply upstream patch for upstream bug 221
- Revert change for false CVE-2020-26159 issue

2
sources
View File

@ -1 +1 @@
SHA512 (onig-6.9.6-rc3.tar.gz) = 8788f6751040c7303a12147adb6f7d1d0c814eee48b58640f7ba3bfa8e68bbaf663c855cec49e957b2e97a4a023996c054dc4f9248cd316024d80c49e46d7bbe
SHA512 (onig-6.9.6-rc4.tar.gz) = 3fdee2986c1e2049d72372692ca8d0d3afa0c4a853b2e30bf7f26409179fcbca92ee5a3b66ec8c8eb4b7084207b9584fbbd07955ddd5b085da1a299f9b602ebf