Changeset 701 for branches/1.3

Timestamp:

2011-02-08T06:23:09+01:00 (2 years ago)

Author:

moo

Message:

merge from trunk: fix segv on shutdown when ionCube Loader is loaded

Location:

branches/1.3

Files:

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

branches/1.3/ChangeLog

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

branches/1.3/NEWS

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

branches/1.3/xcache.c

@@ -2966 +2966 @@
     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();