From 328b7433a47dc0ba3c3fffbe5585927faa5c8aac Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 17 Sep 2024 11:57:50 +0200 Subject: [PATCH 1/6] [server,proxy] fix unchecked return values --- server/proxy/pf_server.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/server/proxy/pf_server.c b/server/proxy/pf_server.c index 6955e5229..417a8e094 100644 --- a/server/proxy/pf_server.c +++ b/server/proxy/pf_server.c @@ -158,13 +158,23 @@ static BOOL pf_server_get_target_info(rdpContext* context, rdpSettings* settings } if (config->TargetUser) - freerdp_settings_set_string(settings, FreeRDP_Username, config->TargetUser); + { + if (!freerdp_settings_set_string(settings, FreeRDP_Username, config->TargetUser)) + return FALSE; + } if (config->TargetDomain) - freerdp_settings_set_string(settings, FreeRDP_Domain, config->TargetDomain); + { + if (!freerdp_settings_set_string(settings, FreeRDP_Domain, config->TargetDomain)) + return FALSE; + } if (config->TargetPassword) - freerdp_settings_set_string(settings, FreeRDP_Password, config->TargetPassword); + { + if (!freerdp_settings_set_string(settings, FreeRDP_Password, + config->TargetPassword)) + return FALSE; + } return TRUE; } From b388739a0c69886f395d6b000668de903dce0a5e Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 17 Sep 2024 12:07:48 +0200 Subject: [PATCH 2/6] [build,mac] fix ignore paths Use CMAKE_IGNORE_PREFIX_PATH to ignore macports/homebrew/... libraries when building a mac os bundle --- scripts/bundle-mac-os.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/bundle-mac-os.sh b/scripts/bundle-mac-os.sh index 6a39fbee0..5d7c69e25 100755 --- a/scripts/bundle-mac-os.sh +++ b/scripts/bundle-mac-os.sh @@ -137,6 +137,7 @@ CMAKE_ARGS="-DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON \ -DINSTALL_BIN_DIR='$INSTALL/bin' \ -DCMAKE_PREFIX_PATH='$INSTALL;$INSTALL/lib;$INSTALL/lib/cmake' \ -DCMAKE_IGNORE_PATH='/opt/local;/usr/local;/opt/homebrew;/Library;~/Library' + -DCMAKE_IGNORE_PREFIX_PATH='/opt/local;/usr/local;/opt/homebrew;/Library;~/Library' " if [ ! -d $SRC ]; From 7f52be7d7565c6d96ce4cabf5a6dc70dce697bfd Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 17 Sep 2024 12:13:53 +0200 Subject: [PATCH 3/6] [codec,dsp] fix build WITH_FAAC --- libfreerdp/codec/dsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libfreerdp/codec/dsp.c b/libfreerdp/codec/dsp.c index c13ed4927..f5b959800 100644 --- a/libfreerdp/codec/dsp.c +++ b/libfreerdp/codec/dsp.c @@ -1531,7 +1531,7 @@ BOOL freerdp_dsp_context_reset(FREERDP_DSP_CONTEXT* WINPR_RESTRICT context, #endif #if defined(WITH_FAAC) - if (context->encoder) + if (context->common.encoder) { faacEncConfigurationPtr cfg; From 618e02a65e6d370105f38fcf4bee061aab52e15e Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 17 Sep 2024 12:39:48 +0200 Subject: [PATCH 4/6] [cmake] fix SWScale library variable name --- channels/rdpecam/client/CMakeLists.txt | 2 +- libfreerdp/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/channels/rdpecam/client/CMakeLists.txt b/channels/rdpecam/client/CMakeLists.txt index 61b211567..ce3438ff5 100644 --- a/channels/rdpecam/client/CMakeLists.txt +++ b/channels/rdpecam/client/CMakeLists.txt @@ -42,7 +42,7 @@ set(${MODULE_PREFIX}_SRCS set(${MODULE_PREFIX}_LIBS freerdp winpr - ${SWSCALE_LIBRARY} + ${SWSCALE_LIBRARIES} ${FFMPEG_LIBRARIES} ) diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt index c8afe4b05..708784194 100644 --- a/libfreerdp/CMakeLists.txt +++ b/libfreerdp/CMakeLists.txt @@ -148,7 +148,7 @@ endif(WITH_CAIRO) # Prefer SWScale over Cairo, both at the same time are not possible. if (WITH_SWSCALE) include_directories(SYSTEM ${SWSCALE_INCLUDE_DIRS}) - freerdp_library_add(${SWSCALE_LIBRARY}) + freerdp_library_add(${SWSCALE_LIBRARIES}) endif() if (WITH_CAIRO) include_directories(SYSTEM ${CAIRO_INCLUDE_DIR}) From 0e97a51181ced43e22dd8336cf717f02dc1ca47f Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 17 Sep 2024 12:46:53 +0200 Subject: [PATCH 5/6] [build,mac] disable CHANNEL_RDPEAR we don't have a MIT-KRB5 library ready on mac os, disable for the time being. --- scripts/bundle-mac-os.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/bundle-mac-os.sh b/scripts/bundle-mac-os.sh index 5d7c69e25..4ce7c7c21 100755 --- a/scripts/bundle-mac-os.sh +++ b/scripts/bundle-mac-os.sh @@ -279,7 +279,8 @@ cmake -GNinja -Bfreerdp -S"$SCRIPT_PATH/.." \ -DWITH_FAAC=ON \ -DWITH_INTERNAL_RC4=ON \ -DWITH_INTERNAL_MD4=ON \ - -DWITH_INTERNAL_MD5=ON + -DWITH_INTERNAL_MD5=ON \ + -DCHANNEL_RDPEAR=OFF cmake --build freerdp cmake --install freerdp From 9278a0adb84c04ac5e78ea80bf442ea6a25dfc46 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Tue, 17 Sep 2024 12:57:59 +0200 Subject: [PATCH 6/6] [clang-tidy] fix typo in deactivated check --- .clang-tidy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.clang-tidy b/.clang-tidy index a74f40275..e746ac41d 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -43,7 +43,7 @@ Checks: > -cppcoreguidelines-no-malloc, -google-readability-braces-around-statements, -google-readability-todo, - -hicpp-avoid-c_arrays, + -hicpp-avoid-c-arrays, -hicpp-braces-around-statements, -hicpp-no-array-decay, -hicpp-no-assembler,