fix segv on shutdown when ionCube Loader is loaded

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@698 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
12 years ago · d6415196ef
parent 1e60365592
commit d6415196ef
3 changed files with 7 additions and 3 deletions
--- a/1
+++ b/1
@ -12,6 +12,7 @@ ChangeLog
 1.3.2 2011-??-??
 ========
 * fix win32 build against win32 native gnu tools
+ * compatibility fix: fix segv on shutdown when ionCube Loader is loaded

 1.3.1 2010-11-27
 ========
--- a/1
+++ b/1
@ -4,6 +4,7 @@
 1.3.2 2011-??-??
 ========
 * win32 build fix
+ * improve compatibility with ionCube Loader

 1.3.1 2010-11-27
 ========
--- a/xcache.c
+++ b/xcache.c
@ -3541,10 +3541,12 @@ static PHP_MSHUTDOWN_FUNCTION(xcache)

 	if (xc_zend_extension_faked) {
 		zend_extension *ext = zend_get_extension(XCACHE_NAME);
-		if (ext->shutdown) {
-			ext->shutdown(ext);
+		if (ext) {
+			if (ext->shutdown) {
+				ext->shutdown(ext);
+			}
+			xc_zend_remove_extension(ext);
 		}
-		xc_zend_remove_extension(ext);
 	}
 	UNREGISTER_INI_ENTRIES();