summaryrefslogtreecommitdiff
path: root/debian/patches/794589-information-disclosure.patch
diff options
context:
space:
mode:
authorJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>2015-11-02 17:51:13 +0000
committerJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>2015-11-02 17:51:13 +0000
commit98c3e224a46705936ea39a3830e50299f2ce3c73 (patch)
treee1245867d3733b5deaf4e41a88a080c3a0b4f59e /debian/patches/794589-information-disclosure.patch
pcre3 (2:8.35-7.4) unstable; urgency=medium
* Non-maintainer upload. * Fix copy-and-paste error in Disable_JIT_on_sparc64.patch. # imported from the archive
Diffstat (limited to 'debian/patches/794589-information-disclosure.patch')
-rw-r--r--debian/patches/794589-information-disclosure.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/debian/patches/794589-information-disclosure.patch b/debian/patches/794589-information-disclosure.patch
new file mode 100644
index 0000000..b3aba7f
--- /dev/null
+++ b/debian/patches/794589-information-disclosure.patch
@@ -0,0 +1,30 @@
+Description: pcre_exec does not fill offsets for certain regexps
+Origin: upstream, http://vcs.pcre.org/pcre/code/trunk/pcre_exec.c?r1=1502&r2=1510
+Bug: https://bugs.exim.org/show_bug.cgi?id=1537
+Bug-Debian: https://bugs.debian.org/794589
+Forwarded: not-needed
+Last-Update: 2015-09-10
+Applied-Upstream: 8.37
+
+--- a/pcre_exec.c
++++ b/pcre_exec.c
+@@ -1467,7 +1467,18 @@ for (;;)
+ md->offset_vector[offset] =
+ md->offset_vector[md->offset_end - number];
+ md->offset_vector[offset+1] = (int)(eptr - md->start_subject);
+- if (offset_top <= offset) offset_top = offset + 2;
++
++ /* If this group is at or above the current highwater mark, ensure that
++ any groups between the current high water mark and this group are marked
++ unset and then update the high water mark. */
++
++ if (offset >= offset_top)
++ {
++ register int *iptr = md->offset_vector + offset_top;
++ register int *iend = md->offset_vector + offset;
++ while (iptr < iend) *iptr++ = -1;
++ offset_top = offset + 2;
++ }
+ }
+ ecode += 1 + IMM2_SIZE;
+ break;