aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/pcre/pcre_exec.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-08-07 18:49:26 +0200
committerRickard Green <[email protected]>2018-08-08 14:00:32 +0200
commit384e8b3b36c6c8ced0778cab9e1569ed0b55e09a (patch)
tree4c3f950d2c5004bcde208291b7d06b1ba2290141 /erts/emulator/pcre/pcre_exec.c
parent4664de710ded469916fcc8f85d4e9791adc319e9 (diff)
downloadotp-384e8b3b36c6c8ced0778cab9e1569ed0b55e09a.tar.gz
otp-384e8b3b36c6c8ced0778cab9e1569ed0b55e09a.tar.bz2
otp-384e8b3b36c6c8ced0778cab9e1569ed0b55e09a.zip
Update PCRE from version 8.41 to version 8.42
Diffstat (limited to 'erts/emulator/pcre/pcre_exec.c')
-rw-r--r--erts/emulator/pcre/pcre_exec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/pcre/pcre_exec.c b/erts/emulator/pcre/pcre_exec.c
index 6708ba92a6..1946e97a72 100644
--- a/erts/emulator/pcre/pcre_exec.c
+++ b/erts/emulator/pcre/pcre_exec.c
@@ -6,7 +6,7 @@
and semantics are as close as possible to those of the Perl 5 language.
Written by Philip Hazel
- Copyright (c) 1997-2014 University of Cambridge
+ Copyright (c) 1997-2018 University of Cambridge
-----------------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
@@ -2407,7 +2407,7 @@ for (;;)
case OP_ANY:
if (IS_NEWLINE(eptr)) RRETURN(MATCH_NOMATCH);
if (md->partial != 0 &&
- eptr + 1 >= md->end_subject &&
+ eptr == md->end_subject - 1 &&
NLBLOCK->nltype == NLTYPE_FIXED &&
NLBLOCK->nllen == 2 &&
UCHAR21TEST(eptr) == NLBLOCK->nl[0])
@@ -3167,7 +3167,7 @@ for (;;)
{
RMATCH(eptr, ecode, offset_top, md, eptrb, RM18);
if (rrc != MATCH_NOMATCH) RRETURN(rrc);
- if (eptr-- == pp) break; /* Stop if tried at original pos */
+ if (eptr-- <= pp) break; /* Stop if tried at original pos */
BACKCHAR(eptr);
}
}
@@ -3326,7 +3326,7 @@ for (;;)
{
RMATCH(eptr, ecode, offset_top, md, eptrb, RM21);
if (rrc != MATCH_NOMATCH) RRETURN(rrc);
- if (eptr-- == pp) break; /* Stop if tried at original pos */
+ if (eptr-- <= pp) break; /* Stop if tried at original pos */
#ifdef SUPPORT_UTF
if (utf) BACKCHAR(eptr);
#endif