[PATCH] shell32/tests: Increase 6 buffers to avoid potential overflows via sprintf (GCC).

Gerald Pfeifer gerald at pfeifer.com
Sun Feb 18 06:36:16 CST 2018


This sheds off 10 warnings from builds with current versions of GCC.

The pattern is printing a pathname plus some additional text into a 
buffer the size of a pathname.

Gerald

Signed-off-by: Gerald Pfeifer <gerald at pfeifer.com>
---
 dlls/shell32/tests/shlexec.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c
index 9db12ce42a..4f00db44e6 100644
--- a/dlls/shell32/tests/shlexec.c
+++ b/dlls/shell32/tests/shlexec.c
@@ -1654,7 +1654,7 @@ static void test_argify(void)
 
 static void test_filename(void)
 {
-    char filename[MAX_PATH];
+    char filename[MAX_PATH+16];
     const filename_tests_t* test;
     char* c;
     INT_PTR rc;
@@ -1920,7 +1920,7 @@ static void test_fileurls(void)
 
 static void test_urls(void)
 {
-    char url[MAX_PATH];
+    char url[MAX_PATH+15];
     INT_PTR rc;
 
     if (!create_test_class("fakeproto", FALSE))
@@ -2015,7 +2015,7 @@ static void test_urls(void)
 static void test_find_executable(void)
 {
     char notepad_path[MAX_PATH];
-    char filename[MAX_PATH];
+    char filename[MAX_PATH+17];
     char command[MAX_PATH];
     const filename_tests_t* test;
     INT_PTR rc;
@@ -2433,7 +2433,7 @@ static void hook_WaitForInputIdle(DWORD (WINAPI *new_func)(HANDLE, DWORD))
 
 static void test_dde(void)
 {
-    char filename[MAX_PATH], defApplication[MAX_PATH];
+    char filename[MAX_PATH+14], defApplication[MAX_PATH];
     const dde_tests_t* test;
     char params[1024];
     INT_PTR rc;
@@ -2600,7 +2600,7 @@ static DWORD CALLBACK ddeThread(LPVOID arg)
 
 static void test_dde_default_app(void)
 {
-    char filename[MAX_PATH];
+    char filename[MAX_PATH+15];
     HSZ hszApplication;
     dde_thread_info_t info = { filename, GetCurrentThreadId() };
     const dde_default_app_tests_t* test;
@@ -2702,7 +2702,7 @@ static void init_test(void)
 {
     HMODULE hdll;
     HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO*);
-    char filename[MAX_PATH];
+    char filename[MAX_PATH+26];
     WCHAR lnkfile[MAX_PATH];
     char params[1024];
     const char* const * testfile;
-- 
2.15.1



More information about the wine-devel mailing list