Fixed a possible buffer overflow condition in vfs_get_module_path().
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7342 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
1802569c68
commit
a44e28cc02
@ -1386,7 +1386,7 @@ vfs_get_module_path(const char *basePath, const char *moduleName, char *pathBuff
|
||||
size_t length;
|
||||
char *path;
|
||||
|
||||
if (strlcpy(pathBuffer, basePath, bufferSize) > bufferSize)
|
||||
if (bufferSize == 0 || strlcpy(pathBuffer, basePath, bufferSize - 1) > bufferSize - 1)
|
||||
return B_BUFFER_OVERFLOW;
|
||||
|
||||
status = path_to_vnode(pathBuffer, true, &dir, true);
|
||||
@ -1395,7 +1395,6 @@ vfs_get_module_path(const char *basePath, const char *moduleName, char *pathBuff
|
||||
|
||||
length = strlen(pathBuffer);
|
||||
if (pathBuffer[length - 1] != '/') {
|
||||
// ToDo: bufferSize race condition
|
||||
pathBuffer[length] = '/';
|
||||
length++;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user