winevt_c 0.4.6 → 0.4.7.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e35c2969b85874f8a795430b9ce36b6a8d7e6622ec5d9e3924d65ff3171095d
-  data.tar.gz: 0c7008c5273f506703f3a278c8c1404796a28e9933d29c025b587f2a07d1491a
+  metadata.gz: daebe6fe343ceb5ee6a226edd4528a9aa2540c9adbb502738a483d8d30f18302
+  data.tar.gz: cf3a4619ee6294496ebb4690afcc82f64c4adccab8633c47035757789c67df52
 SHA512:
-  metadata.gz: f8e2119e6de7b988a57d9ea04cb18370dbfaac84f1b2fe48b9fa44763bf7e73ed4ad8aa5458e970a21b0f054296a08c6835b118b58d5a4fb0b8c3c8903b237cd
-  data.tar.gz: 3f41be719b834e8aa0b72624f852e334e669974af0151f5ba83562b9bffaa4f997908f50de4b40426ce9298df17374f4ce1c394d858e39796ee6e0137b5e79d7
+  metadata.gz: e0e0154f80009838480068032ddc7e30a0e1d734fa5d0d322829c039048c0ba1f12f6ba2fce0002029db3b6dad510d6ea6e226ff6e090ba8b222c6413e2e0ef3
+  data.tar.gz: 606760e22e450fe632053055278a755af7438b72772dba82c270b16bd8d2ca60eb2c480f4bf81ab44a8b904625f3056717970de7fe067e765b60717aabfa3198

data/ext/winevt/winevt_utils.cpp

@@ -2,6 +2,7 @@
 #include <sddl.h>
 #include <stdlib.h>
 #include <string>
+#include <memory>
 
 char*
 wstr_to_mbstr(UINT cp, const WCHAR *wstr, int clen)
@@ -23,20 +24,17 @@ void free_allocated_mbstr(const char* str)
 VALUE
 wstr_to_rb_str(UINT cp, const WCHAR *wstr, int clen)
 {
-    char *ptr;
     int len = WideCharToMultiByte(cp, 0, wstr, clen, nullptr, 0, nullptr, nullptr);
-    if (!(ptr = static_cast<char *>(xmalloc(len)))) return rb_utf8_str_new_cstr("");
-    WideCharToMultiByte(cp, 0, wstr, clen, ptr, len, nullptr, nullptr);
-
-    VALUE str = rb_utf8_str_new_cstr(ptr);
-    xfree(ptr);
+    std::unique_ptr<char[]> ptr(new char[len]);
+    WideCharToMultiByte(cp, 0, wstr, clen, ptr.get(), len, nullptr, nullptr);
+    VALUE str = rb_utf8_str_new_cstr(ptr.get());
 
     return str;
 }
 
 WCHAR* render_event(EVT_HANDLE handle, DWORD flags)
 {
-  PWSTR      buffer = nullptr;
+  std::unique_ptr<WCHAR[]> buffer(new WCHAR[0]);
   ULONG      bufferSize = 0;
   ULONG      bufferSizeNeeded = 0;
   ULONG      status, count;
@@ -45,9 +43,8 @@ WCHAR* render_event(EVT_HANDLE handle, DWORD flags)
 
   do {
     if (bufferSizeNeeded > bufferSize) {
-      free(buffer);
       bufferSize = bufferSizeNeeded;
-      buffer = static_cast<WCHAR *>(xmalloc(bufferSize));
+      buffer.reset(new WCHAR[bufferSize]);
       if (buffer == nullptr) {
         status = ERROR_OUTOFMEMORY;
         bufferSize = 0;
@@ -60,7 +57,7 @@ WCHAR* render_event(EVT_HANDLE handle, DWORD flags)
                   handle,
                   flags,
                   bufferSize,
-                  buffer,
+                  buffer.get(),
                   &bufferSizeNeeded,
                   &count) != FALSE) {
       status = ERROR_SUCCESS;
@@ -84,10 +81,7 @@ WCHAR* render_event(EVT_HANDLE handle, DWORD flags)
     rb_raise(rb_eWinevtQueryError, "ErrorCode: %ld\nError: %s\n", status, RSTRING_PTR(errmsg));
   }
 
-  result = _wcsdup(buffer);
-
-  if (buffer)
-    xfree(buffer);
+  result = _wcsdup(buffer.get());
 
   return result;
 }
@@ -177,7 +171,8 @@ VALUE get_values(EVT_HANDLE handle)
       if (pRenderedValues[i].StringVal == nullptr) {
         rb_ary_push(userValues, rb_utf8_str_new_cstr("(NULL)"));
       } else {
-        rbObj = wstr_to_rb_str(CP_UTF8, pRenderedValues[i].StringVal, -1);
+        std::wstring wStr(pRenderedValues[i].StringVal);
+        rbObj = wstr_to_rb_str(CP_UTF8, wStr.c_str(), -1);
         rb_ary_push(userValues, rbObj);
       }
       break;

data/lib/winevt/version.rb

@@ -1,3 +1,3 @@
 module Winevt
-  VERSION = "0.4.6"
+  VERSION = "0.4.7.rc"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: winevt_c
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7.rc
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-04 00:00:00.000000000 Z
+date: 2019-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -133,9 +133,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.3