From 2e12c2408e279d4d04d8ef520404ed55ecbd20a9 Mon Sep 17 00:00:00 2001
From: nvt-se <nvt-se>
Date: Wed, 25 Feb 2009 23:59:26 +0000
Subject: [PATCH] bug fix: removed possible null pointer dereference.

---
 core/cfs/cfs-coffee.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/cfs/cfs-coffee.c b/core/cfs/cfs-coffee.c
index d9e6884a6..33fc71912 100644
--- a/core/cfs/cfs-coffee.c
+++ b/core/cfs/cfs-coffee.c
@@ -503,7 +503,7 @@ remove_by_page(coffee_page_t page, int remove_log, int close_fds)
   if(close_fds) {
     last_valid = -1;
     for(i = 0; i < COFFEE_FD_SET_SIZE; i++) {
-      if(coffee_fd_set[i].file->page == page) {
+      if(coffee_fd_set[i].file != NULL && coffee_fd_set[i].file->page == page) {
 	coffee_fd_set[i].flags = COFFEE_FD_FREE;
 	last_valid = i;
       }
@@ -1095,7 +1095,6 @@ cfs_write(int fd, const void *buf, unsigned size)
       lp.offset = fdp->offset;
       lp.buf = (char *)buf + size - remains;
       lp.size = remains;
-
       i = write_log_page(file, &lp);
       if(i == 0) {
 	file = fdp->file;
@@ -1109,8 +1108,7 @@ cfs_write(int fd, const void *buf, unsigned size)
       fdp->offset += i;
     }
   } else {
-    COFFEE_WRITE(buf, size,
-	absolute_offset(file->page, fdp->offset));
+    COFFEE_WRITE(buf, size, absolute_offset(file->page, fdp->offset));
     fdp->offset += size;
   }