Changeset 329 for trunk

Timestamp:

12/16/2006 01:04:32 PM (6 years ago)

Author:

moo

Message:

trunk: merged 328, fixed #56: xcache_set segfaults when xcache.var_size=0

Location:

trunk

Files:

• . (modified) (1 prop)
• NEWS (modified) (1 diff)
• xcache.c (modified) (6 diffs)

trunk/NEWS

@@ +1 @@
+2.0.0 2007-?-?
+== NEWS ==
+== ChangeLog ==
+ * fixed #56: xcache_set segfaults when xcache.var_size=0
+ 
+========
 1.2.0 2006-12-10
 NEWS

trunk/xcache.c

@@ -1865 +1865 @@
 /* }}} */
 
+#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"); \
+} while (0)
+
 static int xc_entry_init_key_var(xc_entry_t *xce, zval *name TSRMLS_DC) /* {{{ */
 {
@@ -1906 +1910 @@
     xc_entry_data_var_t var;
     zval *name;
+
+    if (!xc_var_caches) {
+        VAR_DISABLED_WARNING();
+        RETURN_NULL();
+    }
 
     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &name) == FAILURE) {
@@ -1939 +1948 @@
     zval *value;
 
+    if (!xc_var_caches) {
+        VAR_DISABLED_WARNING();
+        RETURN_NULL();
+    }
+
     xce.ttl = XG(var_ttl);
     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz|l", &name, &value, &xce.ttl) == FAILURE) {
@@ -1969 +1983 @@
     xc_entry_data_var_t var;
     zval *name;
+
+    if (!xc_var_caches) {
+        VAR_DISABLED_WARNING();
+        RETURN_FALSE;
+    }
 
     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &name) == FAILURE) {
@@ -2001 +2020 @@
     zval *name;
 
+    if (!xc_var_caches) {
+        VAR_DISABLED_WARNING();
+        RETURN_FALSE;
+    }
+
     if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &name) == FAILURE) {
         return;
@@ -2027 +2051 @@
     long value = 0;
     zval oldzval;
+
+    if (!xc_var_caches) {
+        VAR_DISABLED_WARNING();
+        RETURN_NULL();
+    }
 
     xce.ttl = XG(var_ttl);