Changeset 694ca93f in mainline for uspace/srv/vfs/vfs_file.c

Timestamp:

2011-05-01T19:34:26Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

0e26444

Parents:

1ff896e (diff), 042fbe0 (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 mainline 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);