Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ufs2: Fix wrong lookup iteration

Browse Source 
Passed size needs to be size of name buffer, not of length we compare to.
Fix the value and remove now unused parameter.

Change-Id: Idb69a0e78ba376751edf8b3df3635cd0af4c9460
Reviewed-on: https://review.haiku-os.org/c/haiku/+/6850
Reviewed-by: Adrien Destugues <pulkomandy@pulkomandy.tk>
This commit is contained in:
Vladimir Serbinenko 2023-08-20 17:41:34 +02:00 committed by Adrien Destugues
parent a4845b5416
commit de4f20d48d
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/add-ons/kernel/file_systems/ufs2/DirectoryIterator.cpp
View File

@ -42,18 +42,19 @@ DirectoryIterator::InitCheck()
status_t
DirectoryIterator::Lookup(const char* name, size_t length, ino_t* _id)
DirectoryIterator::Lookup(const char* name, ino_t* _id)
{
if (strcmp(name, ".") == 0) {
*_id = fInode->ID();
return B_OK;
}
char getname[B_FILE_NAME_LENGTH];
char getname[B_FILE_NAME_LENGTH + 1];
status_t status;
while(true) {
status = GetNext(getname, &length, _id);
size_t len = sizeof (getname) - 1;
status = GetNext(getname, &len, _id);
if (status != B_OK)
return status;
if (strcmp(getname, name) == 0)

3
src/add-ons/kernel/file_systems/ufs2/DirectoryIterator.h
View File

@ -42,8 +42,7 @@ public:
~DirectoryIterator();
status_t InitCheck();
status_t Lookup(const char* name, size_t length,
ino_t* id);
status_t Lookup(const char* name, ino_t* id);
status_t GetNext(char* name, size_t* _nameLength,
ino_t* _id);
status_t _GetNext(const char* name, size_t* _nameLength,

3
src/add-ons/kernel/file_systems/ufs2/kernel_interface.cpp
View File

@ -214,8 +214,7 @@ ufs2_lookup(fs_volume *_volume, fs_vnode *_directory, const char *name,
Volume* volume = (Volume*)_volume->private_volume;
Inode* directory = (Inode*)_directory->private_node;
status_t status = DirectoryIterator(directory).Lookup(name, strlen(name),
(ino_t*)_vnodeID);
status_t status = DirectoryIterator(directory).Lookup(name, _vnodeID);
if (status != B_OK)
return status;