Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3eeb28eb763df84639402e2525ee4e5c77bfe4f2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3eeb28eb763df84639402e2525ee4e5c77bfe4f2)
  • Date: Sat, 22 Nov 2014 02:58:38 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

libs/pcre/DETAILS | 3 ++-
libs/pcre/HISTORY | 5 +++++
libs/pcre/PRE_BUILD | 3 +++
libs/pcre/cve-2014-8964 | 15 +++++++++++++++
4 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit 3eeb28eb763df84639402e2525ee4e5c77bfe4f2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pcre -SECURITY FIX cve-2014-8964

commit 7d5efc1a3f948218f42694229615bf9b7d86394f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pcre: => 8.36

diff --git a/libs/pcre/DETAILS b/libs/pcre/DETAILS
index 20b13a0..0581903 100755
--- a/libs/pcre/DETAILS
+++ b/libs/pcre/DETAILS
@@ -1,6 +1,7 @@
SPELL=pcre
- VERSION=8.35
+ VERSION=8.36
PATCHLEVEL=1
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index 5b4e00e..a90e71b 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,8 @@
+2014-11-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 8.36
+ SECURITY_PATCH++, upstream patch
+ * PRE_BUILD, cve-2014-8964: added
+
2014-04-04 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 8.35

diff --git a/libs/pcre/PRE_BUILD b/libs/pcre/PRE_BUILD
new file mode 100755
index 0000000..fe4a475
--- /dev/null
+++ b/libs/pcre/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p0 < $SPELL_DIRECTORY/cve-2014-8964
diff --git a/libs/pcre/cve-2014-8964 b/libs/pcre/cve-2014-8964
new file mode 100644
index 0000000..e15e0b0
--- /dev/null
+++ b/libs/pcre/cve-2014-8964
@@ -0,0 +1,15 @@
++++ pcre_exec.c (working copy)
+@@ -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];



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3eeb28eb763df84639402e2525ee4e5c77bfe4f2), Treeve Jelbert, 11/22/2014

Archive powered by MHonArc 2.6.24.

Top of Page