winevt_c 0.4.0-x64-mingw32 → 0.4.1-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3db8c9996ea38b08c444720be709a582bba72bba3c3e0bfe40afcc59868c6a3
-  data.tar.gz: 5b811af403f50472d36b4ed027f2fd2d7b800b00b9255541fcb7ef18bfde9a06
+  metadata.gz: 88141775c03683c6fd5da7e76e8bf0be595695c645714261e02e61ff81af9ec8
+  data.tar.gz: fc22c0af77c78433a14a880c67bd45410b051780617305f3dc00006d03cbe810
 SHA512:
-  metadata.gz: d9479f6e2a60ff18e0f4fa6ad5e295b5584231c11829b7b2804f082c321e02df62cd60ffda2d0017b45639f43c7eb57b49ed37bed899e82d0835c0046a91b95b
-  data.tar.gz: edd45eb310d5461633072d7296f2f64aa545c749e708fd0c04e234ce7b5c9d64b4f299f0a51a377c68db17fad953b540bd90d0974d76ff4e5ac6134a8a63577a
+  metadata.gz: 28d084d5623e96846f77f91bdbbfc15f6883f0196d17ec64a2a10ebab1f830361e0fd023cbe4c205b62cbd821d0d5e23815dd076a732ed22922c92668f100be7
+  data.tar.gz: 63404d30eb3eec15bd635921035ad24783cbd8856ba4b2098c37f9b17b2160eeca7fdc83a57fc5e1641619b3b1894b615aa4e299db20a5d85369c3eb85d29f3f

data/ext/winevt/winevt_query.c

@@ -148,6 +148,8 @@ rb_winevt_query_render(VALUE self)
 
   utf8str = rb_utf8_str_new_cstr(result);
   free_allocated_mbstr(result);
+  if (wResult != NULL)
+    free(wResult);
 
   return utf8str;
 }

data/ext/winevt/winevt_subscribe.c

@@ -164,6 +164,8 @@ rb_winevt_subscribe_render(VALUE self)
 
   utf8str = rb_utf8_str_new_cstr(result);
   free_allocated_mbstr(result);
+  if (wResult != NULL)
+    free(wResult);
 
   return utf8str;
 }

data/ext/winevt/winevt_utils.c

@@ -69,7 +69,7 @@ WCHAR* render_event(EVT_HANDLE handle, DWORD flags)
     rb_raise(rb_eWinevtQueryError, "ErrorCode: %d\nError: %s\n", status, RSTRING_PTR(errmsg));
   }
 
-  result = buffer;
+  result = _wcsdup(buffer);
 
   if (buffer)
     xfree(buffer);
@@ -214,6 +214,7 @@ VALUE get_values(EVT_HANDLE handle)
         result = wstr_to_mbstr(CP_UTF8, tmpWChar, -1);
         rb_ary_push(userValues, rb_utf8_str_new_cstr(result));
         free_allocated_mbstr(result);
+        CoTaskMemFree(tmpWChar);
       } else {
         rb_ary_push(userValues, rb_utf8_str_new_cstr("?"));
       }
@@ -253,6 +254,7 @@ VALUE get_values(EVT_HANDLE handle)
         result = wstr_to_mbstr(CP_UTF8, tmpWChar, -1);
         rb_ary_push(userValues, rb_utf8_str_new_cstr(result));
         free_allocated_mbstr(result);
+        LocalFree(tmpWChar);
       } else {
         rb_ary_push(userValues, rb_utf8_str_new_cstr("?"));
       }
@@ -300,6 +302,7 @@ static WCHAR* get_message(EVT_HANDLE hMetadata, EVT_HANDLE handle)
   LPVOID lpMsgBuf;
   WCHAR*     prevBuffer;
   WCHAR     *message;
+  WCHAR     *reallocatedMessage;
 
   message = (WCHAR *)xmalloc(sizeof(WCHAR) * BUFSIZE);
   if (!EvtFormatMessage(hMetadata, handle, 0xffffffff, 0, NULL, EvtFormatMessageEvent, BUFSIZE, message, &bufferSizeNeeded)) {
@@ -328,7 +331,7 @@ static WCHAR* get_message(EVT_HANDLE hMetadata, EVT_HANDLE handle)
                          MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
                          (WCHAR *) &lpMsgBuf, 0, NULL);
 
-        result = (WCHAR *)lpMsgBuf;
+        result = _wcsdup((WCHAR *)lpMsgBuf);
         LocalFree(lpMsgBuf);
 
         goto cleanup;
@@ -342,7 +345,11 @@ static WCHAR* get_message(EVT_HANDLE hMetadata, EVT_HANDLE handle)
 
     if (status == ERROR_INSUFFICIENT_BUFFER) {
       prevBuffer = message;
-      message = (WCHAR *)realloc(prevBuffer, sizeof(WCHAR) * bufferSizeNeeded);
+      reallocatedMessage = (WCHAR *)realloc(prevBuffer, sizeof(WCHAR) * bufferSizeNeeded);
+      if (reallocatedMessage == NULL) {
+        rb_raise(rb_eWinevtQueryError, "Reallocation failed.");
+      }
+      message = reallocatedMessage;
 
       if(!EvtFormatMessage(hMetadata, handle, 0xffffffff, 0, NULL, EvtFormatMessageEvent, bufferSizeNeeded, message, &bufferSizeNeeded)) {
         status = GetLastError();
@@ -370,7 +377,7 @@ static WCHAR* get_message(EVT_HANDLE hMetadata, EVT_HANDLE handle)
                              MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
                              (WCHAR *) &lpMsgBuf, 0, NULL);
 
-            result = (WCHAR *)lpMsgBuf;
+            result = _wcsdup((WCHAR *)lpMsgBuf);
             LocalFree(lpMsgBuf);
 
             goto cleanup;
@@ -382,7 +389,7 @@ static WCHAR* get_message(EVT_HANDLE hMetadata, EVT_HANDLE handle)
     }
   }
 
-  result = message;
+  result = _wcsdup(message);
 
 cleanup:
 
@@ -450,7 +457,7 @@ WCHAR* get_description(EVT_HANDLE handle)
     goto cleanup;
   }
 
-  result = get_message(hMetadata, handle);
+  result = _wcsdup(get_message(hMetadata, handle));
 
 #undef BUFSIZE
 

data/lib/winevt/version.rb

@@ -1,3 +1,3 @@
 module Winevt
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: winevt_c
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: x64-mingw32
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2019-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler