winevt_c 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 244a14b164c848b25d2aa5dbc75c5ccdbdb7af62424f37f6463d1be30b673484
-  data.tar.gz: 954aa6d48fd5643d5992841f926c17b0b5c38790f6c1e9e9a4c37c2a2974c4ee
+  metadata.gz: 30a062502e07cec9555ad59177552ddfadcd9148a270637921d8e27f6ee5f9e6
+  data.tar.gz: 34aac8326a5a636c8ceee31770d569372d8975710cf46134f51f2848e512515e
 SHA512:
-  metadata.gz: ac5be5abad00314ee60ec70c914ff53523eea1a918c17133fdde614d2638ddad9fab8f72dd9d57c492b467deaaf0c0c99b58a178b9b3dd072c42656ce93c8e3d
-  data.tar.gz: 59a8a65f8a68c6548f46863e3b82345a5bb0f0a679a63c900e5dd29232940ab421f16b52c0859e1d87430202ca3797b84674b8b6b2cf8d5d3d96aa3bba6d69f8
+  metadata.gz: 5bc59bf70f5d06867c686caeae7c4d59135f6bd6e121c19d8b7665a026ce914278768de5b614548f3c86a35e216f8dea72ca0267bfb194a1d17d80759bcad899
+  data.tar.gz: b65a802022726202958c5c009f68fd941e569d60f4b6d9b0e539a7280b42fe3c732927a264e44681a9e5efae20b0bbb2018f26544961c63052e64cd6f86440d5

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: ruby
 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