Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-04 08:50:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] msi/tests: Use more reasonable buffer sizes for guid strings (Coverity).

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id a853bb6d0a91e5766ff1afbfaf1fcb9b8d27fc76 by Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
winesync 2022-03-13 00:16:20 +01:00 committed by Mark Jansen
parent 6e5382cc5a
commit 609c059647
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/rostests/winetests/msi/msi.c
View file

@ -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);
}
}