diff --git a/ChangeLog b/ChangeLog index 484a000..8aee033 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 ======== diff --git a/NEWS b/NEWS index f94f4ae..66b596c 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ 1.3.2 2011-??-?? ======== * win32 build fix + * improve compatibility with ionCube Loader 1.3.1 2010-11-27 ======== diff --git a/xcache.c b/xcache.c index 136aeef..f1bbb64 100644 --- 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();