Compare commits
10 Commits
c911c89e01
...
ee7622fa55
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ee7622fa55 | ||
|
|
ede9a7d99f | ||
|
|
49eccf48af | ||
|
|
dc46f98c18 | ||
|
|
dc639cd9e6 | ||
|
|
53b60385b7 | ||
|
|
ff8c1223f1 | ||
|
|
dd88457c56 | ||
|
|
56ac261be4 | ||
|
|
1413f48c09 |
@ -1,55 +0,0 @@
|
||||
From 3a9026509f9c1745f378595e55e5024361ad152d Mon Sep 17 00:00:00 2001
|
||||
From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
|
||||
Date: Mon, 10 Feb 2020 17:17:34 +0000
|
||||
Subject: [PATCH] Check the size of the number after (?C as it is read, in
|
||||
order to avoid integer overflow.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1761 2f5784b3-3f2a-0410-8824-cb99058d5e15
|
||||
Petr Písař: Ported to 8.43.
|
||||
---
|
||||
pcre_compile.c | 14 ++++++++------
|
||||
|
||||
diff --git a/pcre_compile.c b/pcre_compile.c
|
||||
index 079d30a..1e3d6c3 100644
|
||||
--- a/pcre_compile.c
|
||||
+++ b/pcre_compile.c
|
||||
@@ -6,7 +6,7 @@
|
||||
and semantics are as close as possible to those of the Perl 5 language.
|
||||
|
||||
Written by Philip Hazel
|
||||
- Copyright (c) 1997-2018 University of Cambridge
|
||||
+ Copyright (c) 1997-2020 University of Cambridge
|
||||
|
||||
-----------------------------------------------------------------------------
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
@@ -7130,17 +7130,19 @@ for (;; ptr++)
|
||||
int n = 0;
|
||||
ptr++;
|
||||
while(IS_DIGIT(*ptr))
|
||||
+ {
|
||||
n = n * 10 + *ptr++ - CHAR_0;
|
||||
+ if (n > 255)
|
||||
+ {
|
||||
+ *errorcodeptr = ERR38;
|
||||
+ goto FAILED;
|
||||
+ }
|
||||
+ }
|
||||
if (*ptr != CHAR_RIGHT_PARENTHESIS)
|
||||
{
|
||||
*errorcodeptr = ERR39;
|
||||
goto FAILED;
|
||||
}
|
||||
- if (n > 255)
|
||||
- {
|
||||
- *errorcodeptr = ERR38;
|
||||
- goto FAILED;
|
||||
- }
|
||||
*code++ = n;
|
||||
PUT(code, 0, (int)(ptr - cd->start_pattern + 1)); /* Pattern offset */
|
||||
PUT(code, LINK_SIZE, 0); /* Default length */
|
||||
--
|
||||
2.21.1
|
||||
|
||||
Binary file not shown.
BIN
pcre-8.45.tar.bz2
Normal file
BIN
pcre-8.45.tar.bz2
Normal file
Binary file not shown.
46
pcre.spec
46
pcre.spec
@ -1,6 +1,6 @@
|
||||
Name: pcre
|
||||
Version: 8.43
|
||||
Release: 6
|
||||
Version: 8.45
|
||||
Release: 5
|
||||
Summary: Perl Compatible Regular Expressions
|
||||
## Source package only:
|
||||
# INSTALL: FSFAP
|
||||
@ -25,9 +25,8 @@ Summary: Perl Compatible Regular Expressions
|
||||
# other files: BSD
|
||||
License: BSD
|
||||
URL: http://www.pcre.org/
|
||||
Source0: https://ftp.pcre.org/pub/pcre/%{name}-%{version}.tar.bz2
|
||||
Source0: https://sourceforge.net/projects/pcre/files/%{name}/%{version}/%{name}-%{version}.tar.bz2
|
||||
|
||||
Patch0000: CVE-2020-14155.patch
|
||||
|
||||
BuildRequires: readline-devel autoconf automake coreutils
|
||||
BuildRequires: gcc git gcc-c++ glibc-common libtool make
|
||||
@ -71,12 +70,12 @@ The %{name}-help package contains doc files for %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version} -p1 -S git
|
||||
libtoolize -cf
|
||||
autoreconf -vif
|
||||
|
||||
%build
|
||||
libtoolize -cf
|
||||
autoreconf -vif
|
||||
%configure \
|
||||
%ifarch riscv64
|
||||
%ifarch riscv64 sw_64 loongarch64
|
||||
--disable-jit \
|
||||
%else
|
||||
--enable-jit \
|
||||
@ -117,6 +116,39 @@ make check VERBOSE=yes
|
||||
%{_mandir}/man3/*
|
||||
|
||||
%changelog
|
||||
* Sat Nov 26 2022 yangmingtai <yangmingtai@huawei.com> - 8.45-5
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:update Source0 URL
|
||||
|
||||
* Mon Nov 14 2022 zhaozhen <zhaozhen@loongson.cn> - 8.45-4
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:fix build error for loongarch64 arch
|
||||
|
||||
* Thu Nov 3 2022 wuzx<wuzx1226@qq.com> - 8.45-3
|
||||
- Add sw64 architecture
|
||||
|
||||
* Wed Oct 5 2022 huangduirong <huangduirong@huawei.com> - 8.45-2
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:update the prep of spec
|
||||
|
||||
* Wed Dec 1 2021 wangjie <wangjie375@huawei.com> - 8.45-1
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:Update pcre to 8.45
|
||||
|
||||
* Thu Jul 23 2020 zhangxingliang <zhangxingliang3@huawei.com> - 8.44-1
|
||||
- Type: update
|
||||
- ID: NA
|
||||
- SUG: NA
|
||||
- DESC: update to 8.44
|
||||
|
||||
* Wed Jun 24 2020 xuping <xuping21@huawei.com> - 8.43-6
|
||||
- Type: cves
|
||||
- ID: CVE-2020-14155
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user