diff options
| author | Rickard Green <[email protected]> | 2018-09-06 15:33:36 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-09-06 15:33:36 +0200 |
| commit | 2917410f3e2baa7fdd9c276c91040b42e6d08ec1 (patch) | |
| tree | 8327de963ae97a7e5254dacd5bdcfb9e1ea3f4d7 /erts/emulator/pcre/pcre_exec.c | |
| parent | ea908f25c2e6f98c2bed977c8fd4fa459315520b (diff) | |
| parent | d4d6ed058530e5db26782dea4a0fd62c2d1098c4 (diff) | |
| download | otp-2917410f3e2baa7fdd9c276c91040b42e6d08ec1.tar.gz otp-2917410f3e2baa7fdd9c276c91040b42e6d08ec1.tar.bz2 otp-2917410f3e2baa7fdd9c276c91040b42e6d08ec1.zip | |
Merge branch 'maint'
* maint:
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.c | 8 |
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 |