Fixed crash bug which was assuming that fd_ptr was always non-null

[samba.git] / source / smbd / files.c

diff --git a/source/smbd/files.c b/source/smbd/files.c
index c369a45bab3e3168ab0cb1381cc838bb9732f55d..3a41c837669dea4754c3297a060b5b588e50a26a 100644 (file)
--- a/source/smbd/files.c
+++ b/source/smbd/files.c
@@ -263,6 +263,7 @@ files_struct *file_find_dit(SMB_DEV_T dev, SMB_INO_T inode, struct timeval *tval
 
        for (fsp=Files;fsp;fsp=fsp->next,count++) {
                if (fsp->open && 
+                       fsp->fd_ptr != NULL &&
                    fsp->fd_ptr->dev == dev && 
                    fsp->fd_ptr->inode == inode &&
                    (tval ? (fsp->open_time.tv_sec == tval->tv_sec) : True ) &&
@@ -277,6 +278,43 @@ files_struct *file_find_dit(SMB_DEV_T dev, SMB_INO_T inode, struct timeval *tval
        return NULL;
 }
 
+/****************************************************************************
+ Find the first fsp given a device and inode.
+****************************************************************************/
+
+files_struct *file_find_di_first(SMB_DEV_T dev, SMB_INO_T inode)
+{
+    files_struct *fsp;
+
+    for (fsp=Files;fsp;fsp=fsp->next) {
+        if (fsp->open &&
+                       fsp->fd_ptr != NULL &&
+            fsp->fd_ptr->dev == dev &&
+            fsp->fd_ptr->inode == inode )
+            return fsp;
+    }
+
+    return NULL;
+}
+
+/****************************************************************************
+ Find the next fsp having the same device and inode.
+****************************************************************************/
+
+files_struct *file_find_di_next(files_struct *start_fsp)
+{
+    files_struct *fsp;
+
+    for (fsp = start_fsp->next;fsp;fsp=fsp->next) {
+        if (fsp->open &&
+                       fsp->fd_ptr != NULL &&
+            fsp->fd_ptr->dev == start_fsp->fd_ptr->dev &&
+            fsp->fd_ptr->inode == start_fsp->fd_ptr->inode )
+            return fsp;
+    }
+
+    return NULL;
+}
 
 /****************************************************************************
 find a fsp that is open for printing
@@ -302,7 +340,7 @@ void file_sync_all(connection_struct *conn)
 
        for (fsp=Files;fsp;fsp=next) {
                next=fsp->next;
-               if (fsp->open && conn == fsp->conn) {
+               if (fsp->open && (conn == fsp->conn) && (fsp->fd_ptr != NULL)) {
                        sync_file(conn,fsp);
                }
        }
@@ -336,7 +374,7 @@ void file_free(files_struct *fsp)
 
        string_free(&fsp->fsp_name);
 
-       if (fsp->fd_ptr && fsp->fd_ptr->ref_count == 0) {
+       if ((fsp->fd_ptr != NULL) && fsp->fd_ptr->ref_count == 0) {
                fd_ptr_free(fsp->fd_ptr);
        }