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

vfs_get_module_path() now actually works: it failed to create a valid full

Browse Source 
path, since it didn't take into account that vnode_path_to_vnode() may
actually change the provided buffer.
Also fixed a potential buffer overrun in that function (bufferSize was
not correctly changed), and added a comment about a previously undocumented
property of vnode_path_to_vnode() that vfs_get_module_path() relies on.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10598 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-01-06 20:20:48 +00:00
parent 75f591f5c0
commit fb77bc372f
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/fs/vfs.cpp
+18 -6
View File
@@ -952,6 +952,8 @@ entry_ref_to_vnode(mount_id mountID, vnode_id directoryID, const char *name, str
/** Returns the vnode for the relative path starting at the specified \a vnode. /** Returns the vnode for the relative path starting at the specified \a vnode.
* \a path must not be NULL. * \a path must not be NULL.
* If it returns successfully, \a path contains the name of the last path
* component.
*/ */
static status_t static status_t
@@ -1812,6 +1814,14 @@ vfs_get_fs_node_from_path(mount_id mountID, const char *path, bool kernel, void
} }
/** Finds the full path to the file that contains the module \a moduleName,
* puts it into \a pathBuffer, and returns B_OK for success.
* If \a pathBuffer was too small, it returns \c B_BUFFER_OVERFLOW,
* \c B_ENTRY_NOT_FOUNT if no file could be found.
* \a pathBuffer is clobbered in any case and must not be relied on if this
* functions returns unsuccessfully.
*/
status_t status_t
vfs_get_module_path(const char *basePath, const char *moduleName, char *pathBuffer, vfs_get_module_path(const char *basePath, const char *moduleName, char *pathBuffer,
size_t bufferSize) size_t bufferSize)
@@ -1828,11 +1838,10 @@ vfs_get_module_path(const char *basePath, const char *moduleName, char *pathBuff
if (status < B_OK) if (status < B_OK)
return status; return status;
length = strlen(pathBuffer); // the path buffer had been clobbered by the above call
if (pathBuffer[length - 1] != '/') { length = strlcpy(pathBuffer, basePath, bufferSize);
pathBuffer[length] = '/'; if (pathBuffer[length - 1] != '/')
length++; pathBuffer[length++] = '/';
}
path = pathBuffer + length; path = pathBuffer + length;
bufferSize -= length; bufferSize -= length;
@@ -1843,8 +1852,10 @@ vfs_get_module_path(const char *basePath, const char *moduleName, char *pathBuff
char *nextPath = strchr(moduleName, '/'); char *nextPath = strchr(moduleName, '/');
if (nextPath == NULL) if (nextPath == NULL)
length = strlen(moduleName); length = strlen(moduleName);
else else {
length = nextPath - moduleName; length = nextPath - moduleName;
nextPath++;
}
if (length + 1 >= bufferSize) { if (length + 1 >= bufferSize) {
status = B_BUFFER_OVERFLOW; status = B_BUFFER_OVERFLOW;
@@ -1866,6 +1877,7 @@ vfs_get_module_path(const char *basePath, const char *moduleName, char *pathBuff
path[length] = '/'; path[length] = '/';
path[length + 1] = '\0'; path[length + 1] = '\0';
path += length + 1; path += length + 1;
bufferSize -= length + 1;
dir = file; dir = file;
} else if (S_ISREG(type)) { } else if (S_ISREG(type)) {