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

Merge pull request #902 from hardening/hardening7 

Corrections found by Valgrind
This commit is contained in:
Marc-André Moreau 2013-01-15 15:12:28 -08:00
parent 3039defc24 71c37bdfc3
commit c219a8d345
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libfreerdp/locale/keyboard_x11.c
View File

@ -232,14 +232,17 @@ UINT32 freerdp_keyboard_init_x11(UINT32 keyboardLayoutId, RDP_SCANCODE x11_keyco
#else
{
char* keymap;
char* xkb_layout;
char* xkb_variant;
char* xkb_layout = 0;
char* xkb_variant = 0;
if (keyboardLayoutId == 0)
{
keyboardLayoutId = freerdp_detect_keyboard_layout_from_xkb(&xkb_layout, &xkb_variant);
free(xkb_layout);
free(xkb_variant);
if (xkb_layout)
free(xkb_layout);
if (xkb_variant)
free(xkb_variant);
}
keymap = freerdp_detect_keymap_from_xkb();

2
libfreerdp/utils/time.c
View File

@ -34,7 +34,7 @@ UINT64 freerdp_windows_gmtime()
time_t unix_time;
UINT64 windows_time;
gmtime(&unix_time);
time(&unix_time);
windows_time = freerdp_get_windows_time_from_unix_time(unix_time);
return windows_time;