github/FreeRDP
7
0
Fork 0
mirror of https://github.com/FreeRDP/FreeRDP.git synced 2025-06-03 00:00:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[locale,keyboard] fix conditionally uninitialized

Browse Source
This commit is contained in:
akallabeth 2024-12-17 15:59:30 +01:00
parent ac9cf26bce
commit 564724d56a
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels/CMakeLists.txt
View File

@ -18,7 +18,7 @@
include(CMakeParseArguments) include(CMakeParseArguments)
include(CMakeDependentOption) include(CMakeDependentOption)
function(define_channel_options) macro(define_channel_options)
set(PREFIX "CHANNEL") set(PREFIX "CHANNEL")
cmake_parse_arguments( cmake_parse_arguments(
@ -53,7 +53,7 @@ function(define_channel_options)
cmake_dependent_option( cmake_dependent_option(
${CHANNEL_SERVER_OPTION} "${CHANNEL_SERVER_OPTION_DOC}" ${CHANNEL_SERVER_DEFAULT} "${CHANNEL_OPTION}" OFF ${CHANNEL_SERVER_OPTION} "${CHANNEL_SERVER_OPTION_DOC}" ${CHANNEL_SERVER_DEFAULT} "${CHANNEL_OPTION}" OFF
) )
endfunction(define_channel_options) endmacro(define_channel_options)
macro(define_channel _channel_name) macro(define_channel _channel_name)
set(CHANNEL_NAME ${_channel_name}) set(CHANNEL_NAME ${_channel_name})

2
channels/ainput/ChannelOptions.cmake
View File

@ -1,4 +1,4 @@
set(OPTION_DEFAULT OFF) set(OPTION_DEFAULT ON)
set(OPTION_CLIENT_DEFAULT ON) set(OPTION_CLIENT_DEFAULT ON)
set(OPTION_SERVER_DEFAULT ON) set(OPTION_SERVER_DEFAULT ON)

2
libfreerdp/locale/keyboard.c
View File

@ -361,11 +361,11 @@ FREERDP_REMAP_TABLE* freerdp_keyboard_remap_string_to_list(const char* list)
if (!list) if (!list)
return remap_table; return remap_table;
BOOL success = FALSE;
char* copy = _strdup(list); char* copy = _strdup(list);
if (!copy) if (!copy)
goto fail; goto fail;
BOOL success = FALSE;
char* context = NULL; char* context = NULL;
char* token = strtok_s(copy, ",", &context); char* token = strtok_s(copy, ",", &context);
while (token) while (token)