diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2015-02-28 14:14:24 +0100 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2015-03-06 13:43:12 +0000 |
| commit | 14fdd946f6260b239ee4215910f87fc2908b8fee (patch) | |
| tree | 30071c1d863c46c14159e6609bb4e79e40ec9efd /src/3rdparty/pcre/pcre_dfa_exec.c | |
| parent | a9a41961c6ef3627a8dd2bf69664c13d9cb20568 (diff) | |
Upgrade PCRE to r1530
Include a couple of hard-to-backport fixes for stack/heap overflows
and regressions from previous PCRE versions (cf. the changelog [1])
[1] http://vcs.pcre.org/viewvc/code/trunk/ChangeLog?view=markup
Change-Id: I618c3633e9265ef1b9fd56b58e2c6c714335aae8
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/pcre/pcre_dfa_exec.c')
| -rw-r--r-- | src/3rdparty/pcre/pcre_dfa_exec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/pcre/pcre_dfa_exec.c b/src/3rdparty/pcre/pcre_dfa_exec.c index 886df525cc..64a495cc04 100644 --- a/src/3rdparty/pcre/pcre_dfa_exec.c +++ b/src/3rdparty/pcre/pcre_dfa_exec.c @@ -3242,7 +3242,7 @@ md->callout_data = NULL; if (extra_data != NULL) { - unsigned int flags = extra_data->flags; + unsigned long int flags = extra_data->flags; if ((flags & PCRE_EXTRA_STUDY_DATA) != 0) study = (const pcre_study_data *)extra_data->study_data; if ((flags & PCRE_EXTRA_MATCH_LIMIT) != 0) return PCRE_ERROR_DFA_UMLIMIT; |