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

Timestamp:

2011-04-14T08:24:29Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

5e07e2b5

Parents:

3f2af64 (diff), 34e8bab (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

File:

• uspace/srv/vfs/vfs_file.c (modified) (1 diff)

uspace/srv/vfs/vfs_file.c

@@ -258 +258 @@
         if ((fd >= 0) && (fd < MAX_OPEN_FILES)) {
                 vfs_file_t *file = FILES[fd];
-                vfs_file_addref(file);
-                fibril_mutex_unlock(&VFS_DATA->lock);
-                return file;
+                if (file != NULL) {
+                        vfs_file_addref(file);
+                        fibril_mutex_unlock(&VFS_DATA->lock);
+                        return file;
+                }
         }
         fibril_mutex_unlock(&VFS_DATA->lock);