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

VFS: fs_mount(): fix FS name leak

Browse Source 
Fixes #9909.
This commit is contained in:
Ingo Weinhold
2013-08-01 15:43:24 +02:00
parent 8f5dbad65b
commit a56422b448
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/fs/vfs.cpp
+1 -3
View File
@@ -7283,11 +7283,11 @@ fs_mount(char* path, const char* device, const char* fsName, uint32 flags,
break; break;
} }
MemoryDeleter layerFSNameDeleter(layerFSName);
volume = (fs_volume*)malloc(sizeof(fs_volume)); volume = (fs_volume*)malloc(sizeof(fs_volume));
if (volume == NULL) { if (volume == NULL) {
status = B_NO_MEMORY; status = B_NO_MEMORY;
free(layerFSName);
goto err1; goto err1;
} }
@@ -7304,7 +7304,6 @@ fs_mount(char* path, const char* device, const char* fsName, uint32 flags,
volume->file_system_name = get_file_system_name(layerFSName); volume->file_system_name = get_file_system_name(layerFSName);
if (volume->file_system_name == NULL) { if (volume->file_system_name == NULL) {
status = B_NO_MEMORY; status = B_NO_MEMORY;
free(layerFSName);
free(volume); free(volume);
goto err1; goto err1;
} }
@@ -7312,7 +7311,6 @@ fs_mount(char* path, const char* device, const char* fsName, uint32 flags,
volume->file_system = get_file_system(layerFSName); volume->file_system = get_file_system(layerFSName);
if (volume->file_system == NULL) { if (volume->file_system == NULL) {
status = B_DEVICE_NOT_FOUND; status = B_DEVICE_NOT_FOUND;
free(layerFSName);
free(volume->file_system_name); free(volume->file_system_name);
free(volume); free(volume);
goto err1; goto err1;