diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-11 13:45:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 13:45:27 +0200 |
| commit | 41c28aae9a9eb670f782b542b00ca95a5bc12423 (patch) | |
| tree | b73462cf252d1d1d9add95826d67aded40379b3d /thirdparty/pcre2/src/pcre2_jit_match.c | |
| parent | 60c6cf9f71c98ca4d85d976fa8767f22a057c0f5 (diff) | |
| parent | 518e23424ecdd8411e8569b45b515129c4bbba15 (diff) | |
Merge pull request #30514 from akien-mga/pcre2-10.33
pcre2: Update to upstream version 10.33
Diffstat (limited to 'thirdparty/pcre2/src/pcre2_jit_match.c')
| -rw-r--r-- | thirdparty/pcre2/src/pcre2_jit_match.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/thirdparty/pcre2/src/pcre2_jit_match.c b/thirdparty/pcre2/src/pcre2_jit_match.c index 5a66545bae..eee038644d 100644 --- a/thirdparty/pcre2/src/pcre2_jit_match.c +++ b/thirdparty/pcre2/src/pcre2_jit_match.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016 University of Cambridge + New API code Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -152,8 +152,6 @@ else jit_stack = NULL; } -/* JIT only need two offsets for each ovector entry. Hence - the last 1/3 of the ovector will never be touched. */ max_oveccount = functions->top_bracket; if (oveccount > max_oveccount) @@ -173,7 +171,7 @@ else if (rc > (int)oveccount) rc = 0; match_data->code = re; -match_data->subject = subject; +match_data->subject = (rc >= 0 || rc == PCRE2_ERROR_PARTIAL)? subject : NULL; match_data->rc = rc; match_data->startchar = arguments.startchar_ptr - subject; match_data->leftchar = 0; |