From 9554918e30c7366e6c00329ba12f206b7cb0ffe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 13 Mar 2019 10:04:28 +0100 Subject: [PATCH] Fix strncat size argument for GCC9 (#8855) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, the (LTO) linker complained: ``` In function ‘copy_object_names_to_clipboard’, inlined from ‘window_object_load_error_mouseup’ at ../src/openrct2-ui/windows/ObjectLoadError.cpp:450:43: ../src/openrct2-ui/windows/ObjectLoadError.cpp:358:16: error: ‘strncat’ specified bound 1 equals source length [-Werror=stringop-overflow=] 358 | strncat(buffer, PLATFORM_NEWLINE, line_sep_len); | ^ ``` --- src/openrct2-ui/windows/ObjectLoadError.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp index 8281accbde..3624587123 100644 --- a/src/openrct2-ui/windows/ObjectLoadError.cpp +++ b/src/openrct2-ui/windows/ObjectLoadError.cpp @@ -355,7 +355,7 @@ static void copy_object_names_to_clipboard(rct_window* w) } strncat(buffer, _invalid_entries[i].name, nameLength); - strncat(buffer, PLATFORM_NEWLINE, line_sep_len); + strncat(buffer, PLATFORM_NEWLINE, buffer_len - strlen(buffer) - 1); } platform_place_string_on_clipboard(buffer);