Changeset 119 for trunk/mmap.c

Timestamp:

2006-09-01T01:45:54+02:00 (7 years ago)

Author:

moo

Message:

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

File:

• trunk/mmap.c (modified) (5 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;
 }