diff options
| author | Monty <monty@mariadb.org> | 2019-09-02 14:06:56 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-09-03 13:17:32 +0300 |
| commit | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch) | |
| tree | b592c10cb8ca3036688ea19039208eadd485fe7c /pcre | |
| parent | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff) | |
| parent | 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff) | |
| download | mariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'pcre')
| -rw-r--r-- | pcre/pcre_dfa_exec.c | 1 | ||||
| -rw-r--r-- | pcre/pcre_exec.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pcre/pcre_dfa_exec.c b/pcre/pcre_dfa_exec.c index f333381d088..830c4e4be48 100644 --- a/pcre/pcre_dfa_exec.c +++ b/pcre/pcre_dfa_exec.c @@ -2198,6 +2198,7 @@ for (;;) case 0x2029: #endif /* Not EBCDIC */ if ((md->moptions & PCRE_BSR_ANYCRLF) != 0) break; + /* fall through */ case CHAR_LF: ADD_NEW(state_offset + 1, 0); diff --git a/pcre/pcre_exec.c b/pcre/pcre_exec.c index 93256d32455..88a9a79e489 100644 --- a/pcre/pcre_exec.c +++ b/pcre/pcre_exec.c @@ -2086,7 +2086,7 @@ for (;;) case OP_CIRC: if (md->notbol && eptr == md->start_subject) RRETURN(MATCH_NOMATCH); - /* Start of subject assertion */ + /* Fall through. Start of subject assertion */ case OP_SOD: if (eptr != md->start_subject) RRETURN(MATCH_NOMATCH); |