fixes to make MO compile with mingw (also fixes some warnings generated by mingw)

1 files changed, 3 insertions, 5 deletions

diff --git a/src/shared/util.cpp b/src/shared/util.cpp
index 75d80d83..e5bcd436 100644
--- a/src/shared/util.cpp
+++ b/src/shared/util.cpp
@@ -135,24 +135,22 @@ VS_FIXEDFILEINFO GetFileVersion(const std::wstring &fileName)
     throw windows_error("failed to determine file version info size");

   }

 

-  void *buffer = new char[size];

+  boost::scoped_array<char> buffer(new char[size]);

   try {

     handle = 0UL;

-    if (!::GetFileVersionInfoW(fileName.c_str(), handle, size, buffer)) {

+    if (!::GetFileVersionInfoW(fileName.c_str(), handle, size, buffer.get())) {

       throw windows_error("failed to determine file version info");

     }

 

     void *versionInfoPtr = nullptr;

     UINT versionInfoLength = 0;

-    if (!::VerQueryValue(buffer, L"\\", &versionInfoPtr, &versionInfoLength)) {

+    if (!::VerQueryValue(buffer.get(), L"\\", &versionInfoPtr, &versionInfoLength)) {

       throw windows_error("failed to determine file version");

     }

 

     VS_FIXEDFILEINFO result = *(VS_FIXEDFILEINFO*)versionInfoPtr;

-    delete [] buffer;

     return result;

   } catch (...) {

-    delete [] buffer;

     throw;

   }

 }