Fixed Release linker dependency on version.lib; few C++ tweaks for Issue JLospinoso#3

Author: Josh Lospinoso

Gargoyle.vcxproj

@@ -91,6 +91,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>version.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

main.cpp

@@ -3,6 +3,7 @@
 #include <fstream>
 #include "Windows.h"
 #include <psapi.h>
+#include <vector>
 
 using namespace std;
 
@@ -17,7 +18,7 @@ namespace {
     uint32_t relative_offset;
   };
 
-  VersionToOffset mshtml_gadget_offset_map[] = {
+  vector<VersionToOffset> mshtml_gadget_offset_map = {
     {    11,     0, 14393,   953, 0x003CBD4D },
     {     0,     0,     0,     0, 0x006D55DD }  // Provides the default ROP gadget offset (for Windows v8.1?)
   };
@@ -85,29 +86,26 @@ uint32_t get_mshtml_gadget_relative_offset(const char *mshtml_filename) {
   auto version_info_size = GetFileVersionInfoSizeA(mshtml_filename, &version_handle);
   if (version_info_size == 0) throw runtime_error("[-] Couldn't GetFileVersionInfoSize: " + GetLastError());
 
-  LPSTR version_data = new char[version_info_size];
-  auto result = GetFileVersionInfoA(mshtml_filename, version_handle, version_info_size, version_data);
+  vector<char> version_data(version_info_size);
+  auto result = GetFileVersionInfoA(mshtml_filename, version_handle, version_info_size, &version_data[0]);
   if (!result) {
-      delete[] version_data;
       throw runtime_error("[-] Couldn't GetFileVersionInfo: " + GetLastError());
   }
 
   LPBYTE version_info_buffer;
   UINT version_info_buffer_size;
-  result = VerQueryValueA(version_data, "\\", (VOID FAR* FAR*)&version_info_buffer, &version_info_buffer_size);
+  result = VerQueryValueA(&version_data[0], "\\", reinterpret_cast<VOID FAR* FAR*>(&version_info_buffer), &version_info_buffer_size);
   if (!result) {
-      delete[] version_data;
       throw runtime_error("[-] Couldn't VerQueryValue: " + GetLastError());
   }
 
-  VS_FIXEDFILEINFO *version_info = (VS_FIXEDFILEINFO *)version_info_buffer;
+  auto *version_info = reinterpret_cast<VS_FIXEDFILEINFO *>(version_info_buffer);
   WORD unpacked_file_version_words[4] = {
     (version_info->dwFileVersionMS >> 16) & 0xffff,
     (version_info->dwFileVersionMS >> 0) & 0xffff,
     (version_info->dwFileVersionLS >> 16) & 0xffff,
     (version_info->dwFileVersionLS >> 0) & 0xffff };
-  DWORDLONG unpacked_file_version = *(DWORDLONG *)unpacked_file_version_words;
-  delete[] version_data;
+  auto unpacked_file_version = *reinterpret_cast<DWORDLONG *>(unpacked_file_version_words);
 
   printf("[ ] Found %s version %d.%d.%d.%d.\n",
     mshtml_filename,
@@ -118,30 +116,30 @@ uint32_t get_mshtml_gadget_relative_offset(const char *mshtml_filename) {
 
   uint32_t relative_offset = 0;
   auto using_default = false;
-  int entry_num = 0;
+  auto entry_num = 0;
   while (relative_offset == 0) {
-    VersionToOffset *version_entry = &mshtml_gadget_offset_map[entry_num];
-    if (*(DWORDLONG *)version_entry->file_version == unpacked_file_version
-      || *(DWORDLONG *)version_entry->file_version == 0)
+    auto* version_entry = &mshtml_gadget_offset_map[entry_num];
+    if (*reinterpret_cast<DWORDLONG *>(version_entry->file_version) == unpacked_file_version
+      || *reinterpret_cast<DWORDLONG *>(version_entry->file_version) == 0)
       relative_offset = version_entry->relative_offset;
-      using_default = *(DWORDLONG *)version_entry->file_version == 0;
+      using_default = *reinterpret_cast<DWORDLONG *>(version_entry->file_version) == 0;
     ++entry_num;
   }
 
   if (using_default) {
-      printf("[*] WARNING: Unrecognized version, so using default relative offset.\n");
+    printf("[*] WARNING: Unrecognized version, so using default relative offset.\n");
   }
-  printf("[ ] %s ROP gadget is at relative offset 0x%p.\n", mshtml_filename, (void *)relative_offset);
+  printf("[ ] %s ROP gadget is at relative offset 0x%p.\n", mshtml_filename, reinterpret_cast<void *>(relative_offset));
 
   return relative_offset;
 }
 
 void* get_mshtml_gadget() {
-  LPCSTR mshtml_filename = "mshtml.dll";
+  auto mshtml_filename = "mshtml.dll";
   printf("[ ] Loading %s.\n", mshtml_filename);
   auto mshtml_gadget_offset = get_mshtml_gadget_relative_offset(mshtml_filename);
   auto mshtml_base = reinterpret_cast<uint8_t*>(LoadLibraryA(mshtml_filename));
-  if (mshtml_base == 0) throw runtime_error("[-] Couldn't LoadLibrary: " + GetLastError());
+  if (!mshtml_base) throw runtime_error("[-] Couldn't LoadLibrary: " + GetLastError());
 
   printf("[+] Loaded %s into memory at 0x%p.\n", mshtml_filename, mshtml_base);
   return mshtml_base + mshtml_gadget_offset;