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_jit_misc.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_jit_misc.c')
| -rw-r--r-- | ext/pcre/pcre2lib/pcre2_jit_misc.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ext/pcre/pcre2lib/pcre2_jit_misc.c b/ext/pcre/pcre2lib/pcre2_jit_misc.c index 36abdbaf9c..efdb05580f 100644 --- a/ext/pcre/pcre2lib/pcre2_jit_misc.c +++ b/ext/pcre/pcre2lib/pcre2_jit_misc.c @@ -145,11 +145,6 @@ maxsize = (maxsize + STACK_GROWTH_RATE - 1) & ~(STACK_GROWTH_RATE - 1); jit_stack = PRIV(memctl_malloc)(sizeof(pcre2_real_jit_stack), (pcre2_memctl *)gcontext); if (jit_stack == NULL) return NULL; jit_stack->stack = sljit_allocate_stack(startsize, maxsize, &jit_stack->memctl); -if (jit_stack->stack == NULL) - { - jit_stack->memctl.free(jit_stack, jit_stack->memctl.memory_data); - return NULL; - } return jit_stack; #endif |