Merge branch 'PHP-5.5'

* PHP-5.5: Fixed issue php#128 (opcache_invalidate segmentation fault)
salathe · Sep 9, 2013 · df711f2 · df711f2
2 parents 2f4bc9d + 8d860c1
commit df711f2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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;