Nikolay Sivov : msi/tests: Use more reasonable buffer sizes for guid strings (Coverity).
Alexandre Julliard
julliard at winehq.org
Mon Jan 7 16:23:00 CST 2019
Module: wine
Branch: master
Commit: a853bb6d0a91e5766ff1afbfaf1fcb9b8d27fc76
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a853bb6d0a91e5766ff1afbfaf1fcb9b8d27fc76
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sun Jan 6 21:56:12 2019 +0300
msi/tests: Use more reasonable buffer sizes for guid strings (Coverity).
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msi/tests/msi.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c
index 22698d8..1267db3 100644
--- a/dlls/msi/tests/msi.c
+++ b/dlls/msi/tests/msi.c
@@ -34,6 +34,9 @@
#include "wine/test.h"
#include "utils.h"
+#define GUID_SIZE (39)
+#define SQUASHED_GUID_SIZE (33)
+
static BOOL is_wow64;
static const char msifile[] = "winetest.msi";
static const WCHAR msifileW[] = {'w','i','n','e','t','e','s','t','.','m','s','i',0};
@@ -1224,8 +1227,8 @@ static BOOL squash_guid(LPCWSTR in, LPWSTR out)
static void create_test_guid(LPSTR prodcode, LPSTR squashed)
{
- WCHAR guidW[MAX_PATH];
- WCHAR squashedW[MAX_PATH];
+ WCHAR guidW[GUID_SIZE];
+ WCHAR squashedW[SQUASHED_GUID_SIZE];
GUID guid;
HRESULT hr;
int size;
@@ -1233,14 +1236,14 @@ static void create_test_guid(LPSTR prodcode, LPSTR squashed)
hr = CoCreateGuid(&guid);
ok(hr == S_OK, "Expected S_OK, got %d\n", hr);
- size = StringFromGUID2(&guid, guidW, MAX_PATH);
- ok(size == 39, "Expected 39, got %d\n", hr);
+ size = StringFromGUID2(&guid, guidW, ARRAY_SIZE(guidW));
+ ok(size == GUID_SIZE, "Expected %d, got %d.\n", GUID_SIZE, size);
- WideCharToMultiByte(CP_ACP, 0, guidW, size, prodcode, MAX_PATH, NULL, NULL);
+ WideCharToMultiByte(CP_ACP, 0, guidW, size, prodcode, GUID_SIZE, NULL, NULL);
if (squashed)
{
squash_guid(guidW, squashedW);
- WideCharToMultiByte(CP_ACP, 0, squashedW, -1, squashed, MAX_PATH, NULL, NULL);
+ WideCharToMultiByte(CP_ACP, 0, squashedW, -1, squashed, SQUASHED_GUID_SIZE, NULL, NULL);
}
}
More information about the wine-cvs
mailing list