deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

bug fix: removed possible null pointer dereference.

Browse source
This commit is contained in:
nvt-se 2009-02-25 23:59:26 +00:00
parent 9b548619ed
commit 2e12c2408e
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/cfs/cfs-coffee.c
View file

@ -503,7 +503,7 @@ remove_by_page(coffee_page_t page, int remove_log, int close_fds)
if(close_fds) { if(close_fds) {
last_valid = -1; last_valid = -1;
for(i = 0; i < COFFEE_FD_SET_SIZE; i++) { 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; coffee_fd_set[i].flags = COFFEE_FD_FREE;
last_valid = i; last_valid = i;
} }
@ -1095,7 +1095,6 @@ cfs_write(int fd, const void *buf, unsigned size)
lp.offset = fdp->offset; lp.offset = fdp->offset;
lp.buf = (char *)buf + size - remains; lp.buf = (char *)buf + size - remains;
lp.size = remains; lp.size = remains;
i = write_log_page(file, &lp); i = write_log_page(file, &lp);
if(i == 0) { if(i == 0) {
file = fdp->file; file = fdp->file;
@ -1109,8 +1108,7 @@ cfs_write(int fd, const void *buf, unsigned size)
fdp->offset += i; fdp->offset += i;
} }
} else { } else {
COFFEE_WRITE(buf, size, COFFEE_WRITE(buf, size, absolute_offset(file->page, fdp->offset));
absolute_offset(file->page, fdp->offset));
fdp->offset += size; fdp->offset += size;
} }