From 7525cfa63719a65d5c5f924219b13a0111f1343f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Mon, 30 Nov 2015 19:14:21 +0100 Subject: testing/nvi: new aport Including a subset of the debian patchset. --- testing/nvi/14private_regex_fixes.patch | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 testing/nvi/14private_regex_fixes.patch (limited to 'testing/nvi/14private_regex_fixes.patch') diff --git a/testing/nvi/14private_regex_fixes.patch b/testing/nvi/14private_regex_fixes.patch new file mode 100644 index 0000000000..b98f553166 --- /dev/null +++ b/testing/nvi/14private_regex_fixes.patch @@ -0,0 +1,28 @@ +From: +Subject: Fixes to the private regex library; includes fix for #523934. + +diff -Naur regex.orig/regcomp.c regex/regcomp.c +--- nvi-1.81.6.orig/regex/regcomp.c 2007-11-18 17:41:42.000000000 +0100 ++++ nvi-1.81.6/regex/regcomp.c 2008-05-01 18:37:57.000000000 +0200 +@@ -606,7 +606,8 @@ + REQUIRE(starordinary, REG_BADRPT); + /* FALLTHROUGH */ + default: +- ordinary(p, c &~ BACKSL); ++ /* ordinary(p, c &~ BACKSL); -- Fix potential overflow */ ++ ordinary(p, c & 0xff); + break; + } + +diff -Naur regex.orig/regexec.c regex/regexec.c +--- nvi-1.81.6.orig/regex/regexec.c 2007-11-18 17:41:42.000000000 +0100 ++++ nvi-1.81.6/regex/regexec.c 2008-05-01 18:38:00.000000000 +0200 +@@ -63,7 +63,7 @@ + + /* macros for manipulating states, small version */ + #define states int +-#define states1 states /* for later use in regexec() decision */ ++typedef states states1; /* for later use in regexec() decision */ + #define CLEAR(v) ((v) = 0) + #define SET0(v, n) ((v) &= ~(1 << (n))) + #define SET1(v, n) ((v) |= 1 << (n)) -- cgit v1.2.3