Changeset 960

Timestamp:

07/09/2012 10:38:25 AM (11 months ago)

Author:

moo

Message:

fixed #283: XCache admin APIs (admin page) cause SEGV if XCache failed to initize

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• xcache.c (modified) (3 diffs)

trunk/ChangeLog

@@ -7 +7 @@
  * WIN32: kill invalidate CRT parameters on shutdown
  * fixed: <=PHP_5_2 duplicate error message failed to include file
+ * fixed #283: XCache admin APIs (admin page) cause SEGV if XCache failed to initize
 
 2.0.0 2012-04-20

trunk/xcache.c

@@ -2731 +2731 @@
     switch (optype) {
         case XC_OP_COUNT:
-            RETURN_LONG(size)
+            RETURN_LONG(caches ? size : 0)
             break;
 
         case XC_OP_INFO:
         case XC_OP_LIST:
-            if (id < 0 || id >= size) {
+            if (!caches || id < 0 || id >= size) {
                 php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cache not exists");
                 RETURN_FALSE;
@@ -2758 +2758 @@
                 int entryslotid, c;
 
-                if (id < 0 || id >= size) {
+                if (!caches || id < 0 || id >= size) {
                     php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cache not exists");
                     RETURN_FALSE;
@@ -2812 +2812 @@
 
 #define VAR_DISABLED_WARNING() do { \
-        php_error_docref(NULL TSRMLS_CC, E_WARNING, "xcache.var_size is either 0 or too small to enable var data caching"); \
+        php_error_docref(NULL TSRMLS_CC, E_WARNING, "XCache var cache was not initialized properly. Check php log for actual reason"); \
 } while (0)