vxcontrol/MemoryModule
1
0
Fork 0
mirror of https://github.com/vxcontrol/MemoryModule.git synced 2026-07-25 00:25:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/secure_crt'

Browse Source
This commit is contained in:
Dmitry Nagibin
2021-01-10 17:51:01 +03:00
parent 47a9ee83db 7d0c143f92
commit 59307f0a63
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MemoryModule.c
+13 -10
View File
@@ -33,6 +33,10 @@
#include <windows.h>
#include <winnt.h>
#include <stddef.h>
#ifdef __MINGW32__
// for mbstowcs_s and wcstombs_s
#include <stdlib.h>
#endif
#include <tchar.h>
#ifdef DEBUG_OUTPUT
#include <stdio.h>
@@ -1007,8 +1011,9 @@ static PIMAGE_RESOURCE_DIRECTORY_ENTRY _MemorySearchResourceEntry(
// using a pre-allocated array.
wchar_t _searchKeySpace[MAX_LOCAL_KEY_LENGTH+1];
LPWSTR _searchKey;
size_t _searchKeySize;
if (searchKeyLen > MAX_LOCAL_KEY_LENGTH) {
size_t _searchKeySize = (searchKeyLen + 1) * sizeof(wchar_t);
_searchKeySize = (searchKeyLen + 1) * sizeof(wchar_t);
_searchKey = (LPWSTR) malloc(_searchKeySize);
if (_searchKey == NULL) {
SetLastError(ERROR_OUTOFMEMORY);
@@ -1016,10 +1021,10 @@ static PIMAGE_RESOURCE_DIRECTORY_ENTRY _MemorySearchResourceEntry(
}
} else {
_searchKey = &_searchKeySpace[0];
_searchKeySize = sizeof(_searchKeySpace);
}
mbstowcs(_searchKey, key, searchKeyLen);
_searchKey[searchKeyLen] = 0;
mbstowcs_s(NULL, _searchKey, _searchKeySize, key, searchKeyLen);
searchKey = _searchKey;
#endif
start = 0;
@@ -1146,7 +1151,7 @@ MemoryLoadStringEx(HMEMORYMODULE module, UINT id, LPTSTR buffer, int maxsize, WO
{
HMEMORYRSRC resource;
PIMAGE_RESOURCE_DIR_STRING_U data;
DWORD size;
int size;
if (maxsize == 0) {
return 0;
}
@@ -1169,15 +1174,13 @@ MemoryLoadStringEx(HMEMORYMODULE module, UINT id, LPTSTR buffer, int maxsize, WO
}
size = data->Length;
if (size >= (DWORD) maxsize) {
size = maxsize;
} else {
buffer[size] = 0;
if (size >= maxsize) {
size = maxsize - 1;
}
#if defined(UNICODE)
wcsncpy(buffer, data->NameString, size);
wcsncpy_s(buffer, maxsize, data->NameString, size);
#else
wcstombs(buffer, data->NameString, size);
wcstombs_s(NULL, buffer, maxsize, data->NameString, size);
#endif
return size;
}