diff options
| author | Anatol Belski <ab@php.net> | 2016-06-19 20:38:31 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-06-19 20:38:31 +0200 |
| commit | 9d4fe9672a1c32d1349f267d24d079e3ebdc83e8 (patch) | |
| tree | 8cbd925487df31704ada1adfdae28b2fd896efa4 /ext/pcre/pcrelib/pcreposix.c | |
| parent | 9d92d0594db6303631d0c71847c60a9d4735fdd0 (diff) | |
| download | php-git-9d4fe9672a1c32d1349f267d24d079e3ebdc83e8.tar.gz | |
upgraded to PCRE 8.39
Diffstat (limited to 'ext/pcre/pcrelib/pcreposix.c')
| -rw-r--r-- | ext/pcre/pcrelib/pcreposix.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/pcre/pcrelib/pcreposix.c b/ext/pcre/pcrelib/pcreposix.c index 8e0d8bb609..cf75588c40 100644 --- a/ext/pcre/pcrelib/pcreposix.c +++ b/ext/pcre/pcrelib/pcreposix.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-2016 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -42,7 +42,9 @@ POSSIBILITY OF SUCH DAMAGE. functions. */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif /* Ensure that the PCREPOSIX_EXP_xxx macros are set appropriately for @@ -171,7 +173,8 @@ static const int eint[] = { REG_BADPAT, /* group name must start with a non-digit */ /* 85 */ REG_BADPAT, /* parentheses too deeply nested (stack check) */ - REG_BADPAT /* missing digits in \x{} or \o{} */ + REG_BADPAT, /* missing digits in \x{} or \o{} */ + REG_BADPAT /* pattern too complicated */ }; /* Table of texts corresponding to POSIX error codes */ @@ -362,6 +365,7 @@ start location rather than being passed as a PCRE "starting offset". */ if ((eflags & REG_STARTEND) != 0) { + if (pmatch == NULL) return REG_INVARG; so = pmatch[0].rm_so; eo = pmatch[0].rm_eo; } |