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

Use secure CRT functions for string copying.

Browse Source
This commit is contained in:
Joachim Bauch
2016-09-21 00:19:52 +02:00
parent 5c6b699b36
commit 2ecf5b764b
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MemoryModule.c
+9 -10
View File
@@ -851,8 +851,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);
@@ -860,10 +861,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;
@@ -990,7 +991,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;
}
@@ -1013,15 +1014,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;
}