7c3f8f33ab
This patch contains: * checks for malloc return value + treat callers; * modified malloc() + ZeroMemory() to calloc(); * misc fixes of micro errors seen during the code audit: ** some invalid checks in gcc.c, also there were some possible integer overflow. This is interesting because at the end the data are parsed and freed directly, so it's a vulnerability in some kind of dead code (at least useless); ** fixed usage of GetComputerNameExA with just one call, when 2 were used in misc places. According to MSDN GetComputerNameA() is supposed to return an error when called with NULL; ** there were a bug in the command line parsing of shadow; ** in freerdp_dynamic_channel_collection_add() the size of array was multiplied by 4 instead of 2 on resize
105 lines
2.3 KiB
C
105 lines
2.3 KiB
C
/**
|
|
* FreeRDP: A Remote Desktop Protocol Implementation
|
|
* FreeRDP Windows Server
|
|
*
|
|
* Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <winpr/tchar.h>
|
|
#include <winpr/windows.h>
|
|
|
|
#include "wf_settings.h"
|
|
|
|
BOOL wf_settings_read_dword(HKEY key, LPTSTR subkey, LPTSTR name, DWORD* value)
|
|
{
|
|
HKEY hKey;
|
|
LONG status;
|
|
DWORD dwType;
|
|
DWORD dwSize;
|
|
DWORD dwValue;
|
|
|
|
status = RegOpenKeyEx(key, subkey, 0, KEY_READ | KEY_WOW64_64KEY, &hKey);
|
|
|
|
if (status == ERROR_SUCCESS)
|
|
{
|
|
dwSize = sizeof(DWORD);
|
|
|
|
status = RegQueryValueEx(hKey, name, NULL, &dwType, (BYTE*) &dwValue, &dwSize);
|
|
|
|
if (status == ERROR_SUCCESS)
|
|
*value = dwValue;
|
|
|
|
RegCloseKey(hKey);
|
|
|
|
return (status == ERROR_SUCCESS) ? TRUE : FALSE;
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
BOOL wf_settings_read_string_ascii(HKEY key, LPTSTR subkey, LPTSTR name, char** value)
|
|
{
|
|
HKEY hKey;
|
|
int length;
|
|
LONG status;
|
|
DWORD dwType;
|
|
DWORD dwSize;
|
|
char* strA;
|
|
TCHAR* strX = NULL;
|
|
|
|
status = RegOpenKeyEx(key, subkey, 0, KEY_READ | KEY_WOW64_64KEY, &hKey);
|
|
|
|
if (status != ERROR_SUCCESS)
|
|
return FALSE;
|
|
|
|
status = RegQueryValueEx(hKey, name, NULL, &dwType, NULL, &dwSize);
|
|
|
|
if (status == ERROR_SUCCESS)
|
|
{
|
|
strX = (LPTSTR) malloc(dwSize + sizeof(TCHAR));
|
|
if (!strX)
|
|
return FALSE;
|
|
status = RegQueryValueEx(hKey, name, NULL, &dwType, (BYTE*) strX, &dwSize);
|
|
|
|
if (status != ERROR_SUCCESS)
|
|
{
|
|
free(strX);
|
|
RegCloseKey(hKey);
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
if (strX)
|
|
{
|
|
#ifdef UNICODE
|
|
length = WideCharToMultiByte(CP_UTF8, 0, strX, lstrlenW(strX), NULL, 0, NULL, NULL);
|
|
strA = (char*) malloc(length + 1);
|
|
WideCharToMultiByte(CP_UTF8, 0, strX, lstrlenW(strX), strA, length, NULL, NULL);
|
|
strA[length] = '\0';
|
|
free(strX);
|
|
#else
|
|
strA = (char*) strX;
|
|
#endif
|
|
*value = strA;
|
|
return TRUE;
|
|
}
|
|
|
|
return FALSE;
|
|
}
|