diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-10-24 15:46:22 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-10-24 15:46:22 +0300 |
| commit | b6ef8998d5ed8bc501a39a624c0d989ecd5a75d4 (patch) | |
| tree | a336fc00af28d5632045195baf14602efb46b71d | |
| parent | a4043831188989609260d633db65d2d28ce0afae (diff) | |
| parent | 335fb94d547f0b2c121e573eff0d102ded586bab (diff) | |
| download | php-git-b6ef8998d5ed8bc501a39a624c0d989ecd5a75d4.tar.gz | |
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed reseting of interned strings buffer.
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index f00d15119f..b834d81679 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -380,6 +380,9 @@ static void accel_interned_strings_restore_state(void) memset(ZCSG(interned_strings).saved_top, 0, (char*)ZCSG(interned_strings).top - (char*)ZCSG(interned_strings).saved_top); + /* Reset "top" */ + ZCSG(interned_strings).top = ZCSG(interned_strings).saved_top; + /* rehash */ memset((char*)&ZCSG(interned_strings) + sizeof(zend_string_table), STRTAB_INVALID_POS, |