git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated embedded PCRE to version 7.4 to avoid 2 CVE issues:-
[exim.git]
/
src
/
src
/
pcre
/
pcre_newline.c
diff --git
a/src/src/pcre/pcre_newline.c
b/src/src/pcre/pcre_newline.c
index bf0ade5ae0873939ebcd7c901d62bf864e8daf38..c71dbafbad7f590938d73521897fb63cf1e9e481 100644
(file)
--- a/
src/src/pcre/pcre_newline.c
+++ b/
src/src/pcre/pcre_newline.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/pcre/pcre_newline.c,v 1.
2 2007/06/26 11:16:54 ph10
Exp $ */
+/* $Cambridge: exim/src/src/pcre/pcre_newline.c,v 1.
3 2007/11/12 13:02:20 nm4
Exp $ */
/*************************************************
* Perl-Compatible Regular Expressions *
/*************************************************
* Perl-Compatible Regular Expressions *
@@
-49,6
+49,10
@@
and NLTYPE_ANY. The full list of Unicode newline characters is taken from
http://unicode.org/unicode/reports/tr18/. */
http://unicode.org/unicode/reports/tr18/. */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "pcre_internal.h"
#include "pcre_internal.h"
@@
-126,12
+130,16
@@
_pcre_was_newline(const uschar *ptr, int type, const uschar *startptr,
{
int c;
ptr--;
{
int c;
ptr--;
+#ifdef SUPPORT_UTF8
if (utf8)
{
BACKCHAR(ptr);
GETCHAR(c, ptr);
}
else c = *ptr;
if (utf8)
{
BACKCHAR(ptr);
GETCHAR(c, ptr);
}
else c = *ptr;
+#else /* no UTF-8 support */
+c = *ptr;
+#endif /* SUPPORT_UTF8 */
if (type == NLTYPE_ANYCRLF) switch(c)
{
if (type == NLTYPE_ANYCRLF) switch(c)
{