Changeset 516

Timestamp:

01/09/2008 03:55:57 AM (11 months ago)

Author:

moo

Message:

fixed #138: no segv if cache is not initialized correctly

Files:

• trunk/xcache.c (modified) (8 diffs)

trunk/xcache.c

@@ -377 +377 @@
     int i, c;
 
-    if (!xc_php_ttl || !xc_php_gc_interval) {
+    if (!xc_php_ttl || !xc_php_gc_interval || !xc_php_caches) {
         return;
     }
@@ -390 +390 @@
     int i, c;
 
-    if (!xc_var_gc_interval) {
+    if (!xc_var_gc_interval || !xc_var_caches) {
         return;
     }
@@ -438 +438 @@
     int i, c;
 
-    for (i = 0, c = xc_php_hcache.size; i < c; i ++) {
-        xc_gc_deletes_one(xc_php_caches[i] TSRMLS_CC);
-    }
-
-    for (i = 0, c = xc_var_hcache.size; i < c; i ++) {
-        xc_gc_deletes_one(xc_var_caches[i] TSRMLS_CC);
+    if (xc_php_caches) {
+        for (i = 0, c = xc_php_hcache.size; i < c; i ++) {
+            xc_gc_deletes_one(xc_php_caches[i] TSRMLS_CC);
+        }
+    }
+
+    if (xc_var_caches) {
+        for (i = 0, c = xc_var_hcache.size; i < c; i ++) {
+            xc_gc_deletes_one(xc_var_caches[i] TSRMLS_CC);
+        }
     }
 }
@@ -715 +719 @@
 static void xc_entry_unholds(TSRMLS_D) /* {{{ */
 {
-    xc_entry_unholds_real(XG(php_holds), xc_php_caches, xc_php_hcache.size TSRMLS_CC);
-    xc_entry_unholds_real(XG(var_holds), xc_var_caches, xc_var_hcache.size TSRMLS_CC);
+    if (xc_php_caches) {
+        xc_entry_unholds_real(XG(php_holds), xc_php_caches, xc_php_hcache.size TSRMLS_CC);
+    }
+
+    if (xc_var_caches) {
+        xc_entry_unholds_real(XG(var_holds), xc_var_caches, xc_var_hcache.size TSRMLS_CC);
+    }
 }
 /* }}} */
@@ -1436 +1445 @@
     xc_shm_t *shm;
     int i;
-    if (!xc_initized) {
-        return 0;
-    }
-    for (i = 0; i < xc_php_hcache.size; i ++) {
-        shm = xc_php_caches[i]->shm;
-        if (shm->handlers->is_readwrite(shm, p)) {
-            return 1;
-        }
-    }
-    for (i = 0; i < xc_var_hcache.size; i ++) {
-        shm = xc_var_caches[i]->shm;
-        if (shm->handlers->is_readwrite(shm, p)) {
-            return 1;
+
+    if (xc_php_caches) {
+        for (i = 0; i < xc_php_hcache.size; i ++) {
+            shm = xc_php_caches[i]->shm;
+            if (shm->handlers->is_readwrite(shm, p)) {
+                return 1;
+            }
+        }
+    }
+
+    if (xc_var_caches) {
+        for (i = 0; i < xc_var_hcache.size; i ++) {
+            shm = xc_var_caches[i]->shm;
+            if (shm->handlers->is_readwrite(shm, p)) {
+                return 1;
+            }
         }
     }
@@ -1458 +1470 @@
     xc_shm_t *shm;
     int i;
-    if (!xc_initized) {
-        return 0;
-    }
-    for (i = 0; i < xc_php_hcache.size; i ++) {
-        shm = xc_php_caches[i]->shm;
-        if (shm->handlers->is_readonly(shm, p)) {
-            return 1;
-        }
-    }
-    for (i = 0; i < xc_var_hcache.size; i ++) {
-        shm = xc_var_caches[i]->shm;
-        if (shm->handlers->is_readonly(shm, p)) {
-            return 1;
+
+    if (xc_php_caches) {
+        for (i = 0; i < xc_php_hcache.size; i ++) {
+            shm = xc_php_caches[i]->shm;
+            if (shm->handlers->is_readonly(shm, p)) {
+                return 1;
+            }
+        }
+    }
+
+    if (xc_var_caches) {
+        for (i = 0; i < xc_var_hcache.size; i ++) {
+            shm = xc_var_caches[i]->shm;
+            if (shm->handlers->is_readonly(shm, p)) {
+                return 1;
+            }
         }
     }
@@ -1734 +1749 @@
         XG(internal_table_copied) = 1;
     }
-    if (xc_php_hcache.size && !XG(php_holds)) {
+    if (xc_php_caches && !XG(php_holds)) {
         XG(php_holds) = calloc(xc_php_hcache.size, sizeof(xc_stack_t));
         for (i = 0; i < xc_php_hcache.size; i ++) {
@@ -1741 +1756 @@
     }
 
-    if (xc_initized && xc_var_hcache.size && !XG(var_holds)) {
+    if (xc_var_caches && !XG(var_holds)) {
         XG(var_holds) = calloc(xc_var_hcache.size, sizeof(xc_stack_t));
         for (i = 0; i < xc_var_hcache.size; i ++) {