diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-09-09 10:11:43 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-09-09 10:11:43 +0400 |
| commit | df711f2c56c74609ec5865fab5fee247b175c654 (patch) | |
| tree | 1287c9317b65201779338c15f34f4a871d2bbe49 | |
| parent | 2f4bc9d4af220f65bea03fe9203539f4a3e6a214 (diff) | |
| parent | 8d860c121810d6a10380241a0a51387966a503ca (diff) | |
| download | php-git-df711f2c56c74609ec5865fab5fee247b175c654.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed issue #128 (opcache_invalidate segmentation fault)
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 2c765f1be7..52e9e98443 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -1062,6 +1062,10 @@ int zend_accel_invalidate(const char *filename, int filename_len, zend_bool forc realpath = accelerator_orig_zend_resolve_path(filename, filename_len TSRMLS_CC); #endif + if (!realpath) { + return FAILURE; + } + persistent_script = zend_accel_hash_find(&ZCSG(hash), realpath, strlen(realpath) + 1); if (persistent_script && !persistent_script->corrupted) { zend_file_handle file_handle; |