Fixed a bug when the dll did not have dynamic base addressing enabled.

bb107 · bb107 · commit 5fb7f591d271 · 2023-05-03T10:52:22.000+08:00
diff --git a/MemoryModule/MemoryModule.cpp b/MemoryModule/MemoryModule.cpp
@@ -265,27 +265,27 @@ NTSTATUS MemoryLoadLibrary(
 	//
 	// Reserve the address range of image
 	//
-	LPBYTE base = (LPBYTE)VirtualAlloc(
-		LPVOID(old_header->OptionalHeader.ImageBase),
-		old_header->OptionalHeader.SizeOfImage,
-		MEM_RESERVE,
-		PAGE_EXECUTE_READWRITE
-	);
+	LPBYTE base = nullptr;
+	if ((old_header->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) == 0) {
+		base = (LPBYTE)VirtualAlloc(
+			LPVOID(old_header->OptionalHeader.ImageBase),
+			old_header->OptionalHeader.SizeOfImage,
+			MEM_RESERVE,
+			PAGE_EXECUTE_READWRITE
+		);
+	}
 	if (!base) {
-		if (old_header->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) {
-
-			base = (LPBYTE)VirtualAlloc(
-				nullptr,
-				old_header->OptionalHeader.SizeOfImage,
-				MEM_RESERVE,
-				PAGE_EXECUTE_READWRITE
-			);
-			if (!base) status = STATUS_NO_MEMORY;
-		}
+		base = (LPBYTE)VirtualAlloc(
+			nullptr,
+			old_header->OptionalHeader.SizeOfImage,
+			MEM_RESERVE,
+			PAGE_EXECUTE_READWRITE
+		);
+		if (!base) status = STATUS_NO_MEMORY;
+	}
 
-		if (!NT_SUCCESS(status)) {
-			return status;
-		}
+	if (!NT_SUCCESS(status)) {
+		return status;
 	}
 
 	//
