diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-30 18:24:48 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-30 18:24:48 +0200 |
| commit | e2a407c2fe788e685055e81d672c8cc6cd7ceaa5 (patch) | |
| tree | eff567b3b57d2ec369e6a8f8615d754a2655cac0 /ext/pcre/pcre2lib/pcre2_valid_utf.c | |
| parent | af4ff75c989374d2f850ae397d62d5a537532c40 (diff) | |
| download | php-git-e2a407c2fe788e685055e81d672c8cc6cd7ceaa5.tar.gz | |
Revert "Update to PCRE2 10.35"
This reverts commit b419f96c626d1f9cbbba42698e947e32a0af9c4f.
This breaks the GCC build with -fcf-protection (default on Ubuntu
at least).
Diffstat (limited to 'ext/pcre/pcre2lib/pcre2_valid_utf.c')
| -rw-r--r-- | ext/pcre/pcre2lib/pcre2_valid_utf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pcre/pcre2lib/pcre2_valid_utf.c b/ext/pcre/pcre2lib/pcre2_valid_utf.c index e47ea78f16..96e8bff993 100644 --- a/ext/pcre/pcre2lib/pcre2_valid_utf.c +++ b/ext/pcre/pcre2lib/pcre2_valid_utf.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-2020 University of Cambridge + New API code Copyright (c) 2016-2017 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -347,7 +347,7 @@ for (p = string; length > 0; p++) length--; if ((*p & 0xfc00) != 0xdc00) { - *erroroffset = p - string - 1; + *erroroffset = p - string; return PCRE2_ERROR_UTF16_ERR2; } } |