winevt_c 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 643bcdf4d5b8c420f73bbb333ff5f43d3aaa49fa5e5c5387f9b56b226a17a95b
-  data.tar.gz: 3e1ac4f307bc238cc6fd3b6a1899d40d5906f73760fdab659a2b13155d4aeab0
+  metadata.gz: 8e35c2969b85874f8a795430b9ce36b6a8d7e6622ec5d9e3924d65ff3171095d
+  data.tar.gz: 0c7008c5273f506703f3a278c8c1404796a28e9933d29c025b587f2a07d1491a
 SHA512:
-  metadata.gz: 14c3237a1fd9e278a1413a75736b75c4715daf9c4f58799bf1136784d3e9139a61a0eca41ba124ce5e740507cfc7a6bcb3c991cd31fd0b453ddcd263486aedf0
-  data.tar.gz: 45562eefcdac2d2214233ee8633b01f0f2eedd258690fc37dbdfef0aaec7b6ca863f66665f499f1039bff25c8b07d327eaf2d444baad09cb85c8ccea5be9246d
+  metadata.gz: f8e2119e6de7b988a57d9ea04cb18370dbfaac84f1b2fe48b9fa44763bf7e73ed4ad8aa5458e970a21b0f054296a08c6835b118b58d5a4fb0b8c3c8903b237cd
+  data.tar.gz: 3f41be719b834e8aa0b72624f852e334e669974af0151f5ba83562b9bffaa4f997908f50de4b40426ce9298df17374f4ce1c394d858e39796ee6e0137b5e79d7

data/ext/winevt/winevt_query.c

@@ -162,6 +162,9 @@ rb_winevt_query_message(VALUE self)
   wResult = get_description(winevtQuery->event);
   utf8str = wstr_to_rb_str(CP_UTF8, wResult, -1);
 
+  if (wResult != NULL)
+    free(wResult);
+
   return utf8str;
 }
 

data/ext/winevt/winevt_subscribe.c

@@ -177,6 +177,9 @@ rb_winevt_subscribe_message(VALUE self)
   wResult = get_description(winevtSubscribe->event);
   utf8str = wstr_to_rb_str(CP_UTF8, wResult, -1);
 
+  if (wResult != NULL)
+    free(wResult);
+
   return utf8str;
 }
 

data/ext/winevt/winevt_utils.cpp

@@ -23,9 +23,13 @@ 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);
-    VALUE str = rb_utf8_str_new(0, len);
-    WideCharToMultiByte(cp, 0, wstr, clen, RSTRING_PTR(str), len, 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);
 
     return str;
 }
@@ -160,7 +164,7 @@ VALUE get_values(EVT_HANDLE handle)
   LARGE_INTEGER timestamp;
   SYSTEMTIME st;
   FILETIME ft;
-  std::string strTime;
+  CHAR strTime[128];
   std::string sResult;
   VALUE rbObj;
 
@@ -247,11 +251,11 @@ VALUE get_values(EVT_HANDLE handle)
       ft.dwHighDateTime = timestamp.HighPart;
       ft.dwLowDateTime  = timestamp.LowPart;
       if (FileTimeToSystemTime( &ft, &st )) {
-        sprintf(&strTime[0], "%04d-%02d-%02d %02d:%02d:%02d.%dZ",
+        sprintf(strTime, "%04d-%02d-%02d %02d:%02d:%02d.%dZ",
                 st.wYear , st.wMonth , st.wDay ,
                 st.wHour , st.wMinute , st.wSecond,
                 st.wMilliseconds);
-        rb_ary_push(userValues, rb_utf8_str_new_cstr(strTime.c_str()));
+        rb_ary_push(userValues, rb_utf8_str_new_cstr(strTime));
       } else {
         rb_ary_push(userValues, rb_utf8_str_new_cstr("?"));
       }
@@ -259,11 +263,11 @@ VALUE get_values(EVT_HANDLE handle)
     case EvtVarTypeSysTime:
       if (pRenderedValues[i].SysTimeVal != nullptr) {
         st = *pRenderedValues[i].SysTimeVal;
-        sprintf(&strTime[0], "%04d-%02d-%02d %02d:%02d:%02d.%dZ",
+        sprintf(strTime, "%04d-%02d-%02d %02d:%02d:%02d.%dZ",
                 st.wYear , st.wMonth , st.wDay ,
                 st.wHour , st.wMinute , st.wSecond,
                 st.wMilliseconds);
-        rb_ary_push(userValues, rb_utf8_str_new_cstr(strTime.c_str()));
+        rb_ary_push(userValues, rb_utf8_str_new_cstr(strTime));
       } else {
         rb_ary_push(userValues, rb_utf8_str_new_cstr("?"));
       }
@@ -471,5 +475,5 @@ cleanup:
   if (hMetadata)
     EvtClose(hMetadata);
 
-  return const_cast<WCHAR *>(result.c_str());
+  return _wcsdup(result.c_str());
 }

data/lib/winevt/version.rb

@@ -1,3 +1,3 @@
 module Winevt
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winevt_c
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Hiroshi Hatake