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

Reserve and commit memory in one step (fixes error found by Coverity, CID 989314).

Browse Source
This commit is contained in:
Joachim Bauch
2013-03-05 00:40:27 +01:00
parent 2b846b727a
commit c01e010793
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MemoryModule.c
+4 -9
View File
@@ -323,16 +323,18 @@ HMEMORYMODULE MemoryLoadLibrary(const void *data)
}
// reserve memory for image of library
// XXX: is it correct to commit the complete memory region at once?
// calling DllEntry raises an exception if we don't...
code = (unsigned char *)VirtualAlloc((LPVOID)(old_header->OptionalHeader.ImageBase),
old_header->OptionalHeader.SizeOfImage,
MEM_RESERVE,
MEM_RESERVE | MEM_COMMIT,
PAGE_READWRITE);
if (code == NULL) {
// try to allocate memory at arbitrary position
code = (unsigned char *)VirtualAlloc(NULL,
old_header->OptionalHeader.SizeOfImage,
MEM_RESERVE,
MEM_RESERVE | MEM_COMMIT,
PAGE_READWRITE);
if (code == NULL) {
#if DEBUG_OUTPUT
@@ -348,13 +350,6 @@ HMEMORYMODULE MemoryLoadLibrary(const void *data)
result->modules = NULL;
result->initialized = 0;
// XXX: is it correct to commit the complete memory region at once?
// calling DllEntry raises an exception if we don't...
VirtualAlloc(code,
old_header->OptionalHeader.SizeOfImage,
MEM_COMMIT,
PAGE_READWRITE);
// commit memory for headers
headers = (unsigned char *)VirtualAlloc(code,
old_header->OptionalHeader.SizeOfHeaders,