From dd3c58c497a58189f5ead6d223f3f8d610d4b3c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Mon, 30 Jan 2017 23:11:08 +0100 Subject: [PATCH] oleview: Fix bytecount for memmoves (Coverity). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel Signed-off-by: Alexandre Julliard --- programs/oleview/details.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/programs/oleview/details.c b/programs/oleview/details.c index b194f6f699a..fda9b7ce12f 100644 --- a/programs/oleview/details.c +++ b/programs/oleview/details.c @@ -139,7 +139,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad } else if(addings && !memcmp(wszName, wszProxyStubClsid32, sizeof(WCHAR[17]))) { - lenData = sizeof(WCHAR[MAX_LOAD_STRING]); + lenData = sizeof(wszData); RegQueryValueW(hCurKey, NULL, wszData, (LONG *)&lenData); RegCloseKey(hCurKey); @@ -155,7 +155,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad RegCloseKey(hCurKey); - memmove(&wszData[6], wszData, lenData * sizeof(WCHAR)); + memmove(&wszData[6], wszData, lenData); memcpy(wszData, wszCLSID, sizeof(WCHAR[6])); wszData[5] = '\\'; @@ -183,7 +183,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad RegCloseKey(hCurKey); - memmove(&wszData[8], wszData, lenData * sizeof(WCHAR)); + memmove(&wszData[8], wszData, lenData); memcpy(wszData, wszTypeLib, sizeof(WCHAR[8])); wszData[7] = '\\'; RegOpenKeyW(HKEY_CLASSES_ROOT, wszData, &hCurKey); @@ -229,12 +229,11 @@ static void CreateReg(WCHAR *buffer) *path = '\\'; path += 1; - lenTree = sizeof(WCHAR[MAX_LOAD_STRING]); + lenTree = sizeof(wszTree); if(RegQueryValueW(hKey, NULL, wszTree, (LONG *)&lenTree) == ERROR_SUCCESS) { - memmove(&wszTree[lenBuffer-lastLenBuffer+3], wszTree, - lenTree * sizeof(WCHAR)); + memmove(&wszTree[lenBuffer-lastLenBuffer+3], wszTree, lenTree); memcpy(wszTree, &buffer[lastLenBuffer], (lenBuffer - lastLenBuffer) * sizeof(WCHAR));