Changeset 698 for trunk

Timestamp:

2011-02-08T06:13:22+01:00 (2 years ago)

Author:

moo

Message:

fix segv on shutdown when ionCube Loader is loaded

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• NEWS (modified) (1 diff)
• xcache.c (modified) (1 diff)

trunk/ChangeLog

@@ -13 +13 @@
 ========
  * 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

trunk/NEWS

@@ -5 +5 @@
 ========
  * win32 build fix
+ * improve compatibility with ionCube Loader
 
 1.3.1 2010-11-27

trunk/xcache.c

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