[arch-commits] Commit in pcre/trunk (001-fix-heap-overflow.patch PKGBUILD)

[Sébastien Luttringer]

    Date: Friday, November 21, 2014 @ 23:59:20
  Author: seblu
Revision: 226803

upgpkg: pcre 8.36-2

- fix FS#42860

Added:
  pcre/trunk/001-fix-heap-overflow.patch
Modified:
  pcre/trunk/PKGBUILD

-----------------------------+
 001-fix-heap-overflow.patch |   16 ++++++++++++++++
 PKGBUILD                    |   12 +++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

Added: 001-fix-heap-overflow.patch
===================================================================
--- 001-fix-heap-overflow.patch	                        (rev 0)
+++ 001-fix-heap-overflow.patch	2014-11-21 22:59:20 UTC (rev 226803)
@@ -0,0 +1,16 @@
+--- a/code/trunk/pcre_exec.c	2014/11/05 15:08:03	1510
++++ b/code/trunk/pcre_exec.c	2014/11/19 20:57:13	1513
+@@ -1404,8 +1404,11 @@
+         condition = TRUE;
+ 
+         /* Advance ecode past the assertion to the start of the first branch,
+-        but adjust it so that the general choosing code below works. */
+-
++        but adjust it so that the general choosing code below works. If the 
++        assertion has a quantifier that allows zero repeats we must skip over 
++        the BRAZERO. This is a lunatic thing to do, but somebody did! */
++        
++        if (*ecode == OP_BRAZERO) ecode++; 
+         ecode += GET(ecode, 1);
+         while (*ecode == OP_ALT) ecode += GET(ecode, 1);
+         ecode += 1 + LINK_SIZE - PRIV(OP_lengths)[condcode];

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-21 21:13:04 UTC (rev 226802)
+++ PKGBUILD	2014-11-21 22:59:20 UTC (rev 226803)
@@ -6,16 +6,22 @@
 
 pkgname=pcre
 pkgver=8.36
-pkgrel=1
+pkgrel=2
 pkgdesc='A library that implements Perl 5-style regular expressions'
 arch=('i686' 'x86_64')
 url='http://www.pcre.org/'
 license=('BSD')
 depends=('gcc-libs' 'readline' 'zlib' 'bzip2' 'bash')
-source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$pkgname-$pkgver.tar.bz2"{,.sig})
+source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$pkgname-$pkgver.tar.bz2"{,.sig}
+        '001-fix-heap-overflow.patch')
 md5sums=('b767bc9af0c20bc9c1fe403b0d41ad97'
-         'SKIP')
+         'SKIP'
+         '44a7e4fca07eff04d07bef65c982de9a')
 
+prepare() {
+  patch -d $pkgname-$pkgver < 001-fix-heap-overflow.patch
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure \