diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2021-01-14 08:16:50 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2021-01-14 08:16:50 +0300 |
| commit | 924ec324260f54d9cd79d6a016cd067454c1d00a (patch) | |
| tree | 8a25a26eec246c8e4e306877d548c2fd16e99fc8 | |
| parent | 4affb585a87231ec4c3d3ad0c2111ee7ecc1be55 (diff) | |
| parent | 3edf5c969a9f5f3290852ab9edf61a876fca63d0 (diff) | |
| download | php-git-924ec324260f54d9cd79d6a016cd067454c1d00a.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Fixed bug #80422 (php_opcache.dll crashes when using Apache 2.4 with JIT)
| -rw-r--r-- | ext/opcache/jit/zend_jit_trace.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c index 853be7517a..69c4f79fa8 100644 --- a/ext/opcache/jit/zend_jit_trace.c +++ b/ext/opcache/jit/zend_jit_trace.c @@ -7629,6 +7629,11 @@ static void zend_jit_trace_init_caches(void) static void zend_jit_trace_reset_caches(void) { JIT_G(tracing) = 0; +#ifdef ZTS + if (!JIT_G(exit_counters)) { + JIT_G(exit_counters) = calloc(JIT_G(max_exit_counters), 1); + } +#endif } static void zend_jit_trace_restart(void) |