i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move NULL check before dereference tries

Browse Source 
CID 5912
This commit is contained in:
Philippe Saint-Pierre
2011-11-27 12:44:05 -05:00
parent 08eb0b74a9
commit b21c95d4f6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/fat/file.c
+5 -5
View File
@@ -1018,6 +1018,11 @@ dosfs_rename(fs_volume *_vol, fs_vnode *_odir, const char *oldname,
DPRINTF(0, ("dosfs_rename called: %Lx/%s->%Lx/%s\n", odir->vnid, oldname, ndir->vnid, newname)); DPRINTF(0, ("dosfs_rename called: %Lx/%s->%Lx/%s\n", odir->vnid, oldname, ndir->vnid, newname));
if (!oldname || !(*oldname) || !newname || !(*newname)) {
result = EINVAL;
goto bi;
}
if(!is_filename_legal(newname)) { if(!is_filename_legal(newname)) {
dprintf("dosfs_rename called with invalid name '%s'\n", newname); dprintf("dosfs_rename called with invalid name '%s'\n", newname);
result = EINVAL; result = EINVAL;
@@ -1030,11 +1035,6 @@ dosfs_rename(fs_volume *_vol, fs_vnode *_odir, const char *oldname,
goto bi; goto bi;
} }
if (!oldname || !(*oldname) || !newname || !(*newname)) {
result = EINVAL;
goto bi;
}
if ((odir->vnid == ndir->vnid) && !strcmp(oldname, newname)) { if ((odir->vnid == ndir->vnid) && !strcmp(oldname, newname)) {
result = EPERM; result = EPERM;
goto bi; goto bi;