cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Security fix for CVE-2015-5073.

Browse Source 
ok robert@ (MAINTAINER)
This commit is contained in:
jasper 2015-06-29 17:06:14 +00:00
parent ddbc697958
commit 4fd3bd9e7b
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/pcre/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.56 2015/06/09 15:05:40 robert Exp $
# $OpenBSD: Makefile,v 1.57 2015/06/29 17:06:14 jasper Exp $
COMMENT= perl-compatible regular expression library
DISTNAME= pcre-8.37
REVISION= 0
REVISION= 1
SHARED_LIBS += pcre 3.0 # 0.1
SHARED_LIBS += pcre16 0.0 # 0.0

15
devel/pcre/patches/patch-pcre_compile_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-pcre_compile_c,v 1.5 2015/06/09 15:05:40 robert Exp $
$OpenBSD: patch-pcre_compile_c,v 1.6 2015/06/29 17:06:15 jasper Exp $
upstream fixes of several buffer overflow issues:
@ -13,9 +13,11 @@ r1559 Fix named forward reference to duplicate group number overflow
r1560 Fix buffer overflow for lookbehind within mutually recursive
subroutines.
r1562 Fix another buffer overflow.
r1571 Fix buffer overflow for forward reference within backward assertion with
excess closing parenthesis. Bugzilla 1651.
--- pcre_compile.c.orig Mon Apr 13 17:54:01 2015
+++ pcre_compile.c Tue Jun 9 17:02:51 2015
+++ pcre_compile.c Mon Jun 29 15:13:08 2015
@@ -1799,7 +1799,7 @@ for (;;)
case OP_ASSERTBACK:
case OP_ASSERTBACK_NOT:
@ -326,3 +328,12 @@ r1562 Fix another buffer overflow.
/* For caseless UTF-8 mode when UCP support is available, check whether
this character has more than one other case. If so, generate a special
@@ -9380,7 +9427,7 @@ OP_RECURSE that are not fixed length get a diagnosic w
exceptional ones forgo this. We scan the pattern to check that they are fixed
length, and set their lengths. */
-if (cd->check_lookbehind)
+if (errorcode == 0 && cd->check_lookbehind)
{
pcre_uchar *cc = (pcre_uchar *)codestart;