Changeset ac23b9d3 in mainline for uspace/srv/vfs/vfs_file.c

Timestamp:

2009-05-23T16:28:28Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ad8fc510

Parents:

493853ec

Message:

avoid accessing uninitialized files array at all times

File:

• uspace/srv/vfs/vfs_file.c (modified) (5 diffs)

uspace/srv/vfs/vfs_file.c

@@ -79 +79 @@
 int vfs_fd_alloc(void)
 {
-        int i;
-
+        if (!vfs_files_init())
+                return ENOMEM;
+        
+        unsigned int i;
         for (i = 0; i < MAX_OPEN_FILES; i++) {
                 if (!files[i]) {
@@ -86 +88 @@
                         if (!files[i])
                                 return ENOMEM;
+                        
                         memset(files[i], 0, sizeof(vfs_file_t));
                         futex_initialize(&files[i]->lock, 1);
                         vfs_file_addref(files[i]);
-                        return i;
+                        return (int) i;
                 }
         }
+        
         return EMFILE;
 }
@@ -104 +108 @@
 int vfs_fd_free(int fd)
 {
+        if (!vfs_files_init())
+                return ENOMEM;
+        
         if ((fd < 0) || (fd >= MAX_OPEN_FILES) || (files[fd] == NULL))
                 return EBADF;
+        
         vfs_file_delref(files[fd]);
         files[fd] = NULL;
+        
         return EOK;
 }
@@ -151 +160 @@
 vfs_file_t *vfs_file_get(int fd)
 {
+        if (!vfs_files_init())
+                return NULL;
+        
         if ((fd >= 0) && (fd < MAX_OPEN_FILES))
                 return files[fd];
+        
         return NULL;
 }
@@ -158 +171 @@
 /**
  * @}
- */ 
+ */