mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

channels/drive: fix double free

This commit is contained in:
Marc-André Moreau 2013-02-18 06:39:17 -05:00
parent 47167b8c98
commit cc3db24be5
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
channels/drive/client/drive_main.c
View File

@ -732,8 +732,6 @@ void drive_register_drive_path(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints, char*
int DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
{
char* name;
char* path;
RDPDR_DRIVE* drive;
#ifdef WIN32
char* dev;
@ -742,44 +740,42 @@ int DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
#endif
drive = (RDPDR_DRIVE*) pEntryPoints->device;
name = drive->Name;
path = drive->Path;
#ifndef WIN32
if (strcmp(path, "*") == 0)
if (strcmp(drive->Path, "*") == 0)
{
/* all drives */
free(path);
path = _strdup("/");
free(drive->Path);
drive->Path = _strdup("/");
}
else if (strcmp(path, "%") == 0)
else if (strcmp(drive->Path, "%") == 0)
{
char* home_env = NULL;
/* home directory */
home_env = getenv("HOME");
free(path);
free(drive->Path);
if (home_env)
path = _strdup(home_env);
drive->Path = _strdup(home_env);
else
path = _strdup("/");
drive->Path = _strdup("/");
}
drive_register_drive_path(pEntryPoints, name, path);
drive_register_drive_path(pEntryPoints, drive->Name, drive->Path);
#else
/* Special case: path[0] == '*' -> export all drives */
/* Special case: path[0] == '%' -> user home dir */
if (path[0] == '%')
if (strcmp(drive->Path, "%") == 0)
{
_snprintf(buf, sizeof(buf), "%s\\", getenv("USERPROFILE"));
drive_register_drive_path(pEntryPoints, name, _strdup(buf));
drive_register_drive_path(pEntryPoints, drive->Name, _strdup(buf));
}
else if (path[0] == '*')
else if (strcmp(drive->Path, "*") == 0)
{
int i;
@ -791,7 +787,7 @@ int DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
if (*dev > 'B')
{
/* Suppress disk drives A and B to avoid pesty messages */
_snprintf(buf, sizeof(buf) - 4, "%s", name);
_snprintf(buf, sizeof(buf) - 4, "%s", drive->Name);
len = strlen(buf);
buf[len] = '_';
buf[len + 1] = dev[0];
@ -803,7 +799,7 @@ int DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints)
}
else
{
drive_register_drive_path(pEntryPoints, name, path);
drive_register_drive_path(pEntryPoints, drive->Name, drive->Path);
}
#endif