diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-21 16:02:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-21 16:02:35 +0200 |
| commit | 1592fbd332373a110edcc28468cd8dc2b99271ef (patch) | |
| tree | ea55441a8d982b7f1593d7fb00f0db7d63924381 /pcre/pcreposix.c | |
| parent | e7591a1ba94f404a87e65554298574bfa97020f2 (diff) | |
| download | mariadb-git-1592fbd332373a110edcc28468cd8dc2b99271ef.tar.gz | |
8.39
Diffstat (limited to 'pcre/pcreposix.c')
| -rw-r--r-- | pcre/pcreposix.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pcre/pcreposix.c b/pcre/pcreposix.c index f024423b634..cf75588c40d 100644 --- a/pcre/pcreposix.c +++ b/pcre/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 @@ -173,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 */ @@ -364,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; } |