github/metasploit-payloads
1
Fork 0
mirror of https://github.com/rapid7/metasploit-payloads synced 2025-02-16 00:24:29 +01:00
Code Releases Activity

Use the proper dirsep and allocate correctly

Browse Source 
Thanks, mm__ for the bug report and the patch!

[Fixes #6322]
This commit is contained in:
James Lee 2012-01-31 17:31:15 -07:00
parent 2ea1162940
commit f34f8b1440
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
c/meterpreter/source/extensions/stdapi/server/fs/dir.c
View File

@ -101,9 +101,13 @@ DWORD request_fs_ls(Remote *remote, Packet *packet)
goto out;
}
data = readdir(ctx);
if (!(baseDirectory = _strdup(directory)))
{
result = ERROR_NOT_ENOUGH_MEMORY;
goto out;
}
#define DF_NAME data->d_name
#endif
do
@ -138,7 +142,11 @@ DWORD request_fs_ls(Remote *remote, Packet *packet)
// Build the full path
if (baseDirectory)
#ifdef _WIN32
sprintf(tempFile, "%s\\%s", baseDirectory, DF_NAME);
#else
sprintf(tempFile, "%s/%s", baseDirectory, DF_NAME);
#endif
else
sprintf(tempFile, "%s", DF_NAME);
@ -211,9 +219,6 @@ again:
#ifdef _WIN32
if (!(realSize = GetCurrentDirectory(directorySize, directory)))
#else
if (!(realSize = getcwd(directory, directorySize)))
#endif
{
result = ERROR_NOT_ENOUGH_MEMORY;
break;
@ -221,11 +226,25 @@ again:
else if (realSize > directorySize)
{
free(directory);
directorySize = realSize;
goto again;
}
#else
if (!getcwd(directory, directorySize))
{
if (errno == ERANGE && directorySize > 0)
{
// Then we didn't allocate enough to hold the whole path,
// increase the size and try again.
free(directory);
directorySize = directorySize * 2;
goto again;
} else {
dprintf("getcwd failed with errno %d", errno);
break;
}
}
#endif
packet_add_tlv_string(response, TLV_TYPE_DIRECTORY_PATH,
directory);