Changeset 119

Timestamp:

08/31/2006 11:45:54 PM (2 years ago)

Author:

moo

Message:

fix leak in xcache.test=1; XCACHE_VERSION/XCACHE_MODULES length off-by-one

Location:

trunk

Files:

• mmap.c (modified) (5 diffs)
• xcache.c (modified) (2 diffs)

trunk/mmap.c

@@ -153 +153 @@
     volatile void *romem;
     char tmpname[sizeof(TMP_PATH) - 1 + 100];
+    const char *errstr = NULL;
 
     CHECK(shm = calloc(1, sizeof(xc_shm_t)), "shm OOM");
@@ -178 +179 @@
         /* do not create file in /dev */
         if (strncmp(shm->name, "/dev", 4) == 0) {
+            perror(shm->name);
+            errstr = "Cannot open file set by xcache.mmap_path";
             goto err;
         }
@@ -183 +186 @@
         shm->newfile = 1;
         if (fd == -1) {
+            perror(shm->name);
+            errstr = "Cannot open or create file set by xcache.mmap_path";
             goto err;
         }
@@ -197 +202 @@
 
     if (shm->ptr == XCACHE_MAP_FAILED) {
+        perror(shm->name);
+        errstr = "Failed creating file mappping";
         shm->ptr = NULL;
         goto err;
@@ -268 +275 @@
         xc_shm_destroy(shm);
     }
+    if (errstr) {
+        fprintf(stderr, "%s\n", errstr);
+        zend_error(E_ERROR, "%s", errstr);
+    }
     return NULL;
 }

trunk/xcache.c

@@ -939 +939 @@
     }
     if (xc_test && stored_xce) {
+        destroy_op_array(op_array TSRMLS_CC);
+        efree(op_array);
         goto restore;
     }
@@ -1065 +1067 @@
     zend_register_long_constant(ZEND_STRS("XC_TYPE_PHP"), XC_TYPE_PHP, CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC);
     zend_register_long_constant(ZEND_STRS("XC_TYPE_VAR"), XC_TYPE_VAR, CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC);
-    zend_register_stringl_constant(ZEND_STRS("XCACHE_VERSION"), ZEND_STRS(XCACHE_VERSION), CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC);
-    zend_register_stringl_constant(ZEND_STRS("XCACHE_MODULES"), ZEND_STRS(XCACHE_MODULES), CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC);
+    zend_register_stringl_constant(ZEND_STRS("XCACHE_VERSION"), ZEND_STRL(XCACHE_VERSION), CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC);
+    zend_register_stringl_constant(ZEND_STRS("XCACHE_MODULES"), ZEND_STRL(XCACHE_MODULES), CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC);
     return 0;
 }