winevt_c 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4aea52298871b70f5fa9f0c01227cd4afb79a188b75e4870a680ed435b7d19fe
-  data.tar.gz: 26ac8f251f2dd6cf077f7481066d1305e023986438a0fbd50fe9fec9dd97c266
+  metadata.gz: 1069bcfe57cfd91d05fcff1a7314929c01c675d30678b8a624c926eb0a91b09f
+  data.tar.gz: bea008c2cf452539b59a9d22800183797babcbb5158e5f6688dd3fd749dc4e3d
 SHA512:
-  metadata.gz: 6e6683d23e26dfa60e4a4e31bb03a434f2e01025c1072de8930d8ca98b7090dd4128711540c65ba35b5d53ca142251bc5eb3881ad1df1af3679c5d84faa2b1f7
-  data.tar.gz: b83a9f1f27428c75f9735297fa19abae507240956a587df4b38c9f0b983f4f1ed82dc4c30ccd64fe4cb12ad7b8ae7b6a70bb89c50bd3e280a568c9eda768d7a2
+  metadata.gz: 81ef978d005e6c87607cc187509f8e5ae52b33b7687100148139b050c09d61cbb813fe1e77f8ccc0a02fa881d6a8066b6f7c959f45be3ff65c79e77b03dbd247
+  data.tar.gz: c27480331ce8d8cfab82cd00ef4bd940e3a4224076db6641e9bb49019a2d88dac2ee73790153a20cf2bbafa1db6844b876f59cb53c249251460b6eb97b895c99

data/ext/winevt/winevt_channel.c

@@ -9,7 +9,9 @@
  *  require 'winevt'
  *  channels = []
  *  @channel = Winevt::EventLog::Channel.new
- *  # If users want to retrive all channel name, it should be set as true.
+ *  # If users want to retrieve all channel names that
+ *  # including type of Debug and Analytical,
+ *  # it should be set as true.
  *  @channel.force_enumerate = false
  *  @channel.each do |channel|
  *    channels << channel
@@ -117,7 +119,7 @@ DWORD is_subscribable_channel_p(EVT_HANDLE hChannel, BOOL force_enumerate)
   DWORD status = ERROR_SUCCESS;
 
   for (int Id = 0; Id < EvtChannelConfigPropertyIdEND; Id++) {
-    if  (!EvtGetChannelConfigProperty(hChannel, (EVT_CHANNEL_CONFIG_PROPERTY_ID)Id, 0, dwBufferSize, pProperty, &dwBufferUsed)) {
+    if (!EvtGetChannelConfigProperty(hChannel, (EVT_CHANNEL_CONFIG_PROPERTY_ID)Id, 0, dwBufferSize, pProperty, &dwBufferUsed)) {
       status = GetLastError();
       if (ERROR_INSUFFICIENT_BUFFER == status) {
         dwBufferSize = dwBufferUsed;
@@ -126,18 +128,20 @@ DWORD is_subscribable_channel_p(EVT_HANDLE hChannel, BOOL force_enumerate)
           pProperty = pTemp;
           pTemp = NULL;
           EvtGetChannelConfigProperty(hChannel, (EVT_CHANNEL_CONFIG_PROPERTY_ID)Id, 0, dwBufferSize, pProperty, &dwBufferUsed);
+          status = GetLastError();
         } else {
           free(pProperty);
 
           status = ERROR_OUTOFMEMORY;
-          rb_raise(rb_eRuntimeError, "realloc failed with %ld\n", status);
+
+          goto cleanup;
         }
       }
 
-      if (ERROR_SUCCESS != (status = GetLastError())) {
+      if (ERROR_SUCCESS != status) {
         free(pProperty);
 
-        rb_raise(rb_eRuntimeError, "EvtGetChannelConfigProperty failed with %ld\n", GetLastError());
+        goto cleanup;
       }
     }
 
@@ -146,6 +150,8 @@ DWORD is_subscribable_channel_p(EVT_HANDLE hChannel, BOOL force_enumerate)
       break;
   }
 
+cleanup:
+
   free(pProperty);
 
   return status;
@@ -246,6 +252,10 @@ rb_winevt_channel_each(VALUE self)
                   _TRUNCATE,
                   "EvtOpenChannelConfig failed with %lu.\n",
                   GetLastError());
+
+      EvtClose(winevtChannel->channels);
+      winevtChannel->channels = NULL;
+
       free(buffer);
       buffer = NULL;
       bufferSize = 0;
@@ -254,8 +264,35 @@ rb_winevt_channel_each(VALUE self)
     }
 
     status = is_subscribable_channel_p(hChannelConfig, winevtChannel->force_enumerate);
-    if (status != ERROR_SUCCESS)
+    EvtClose(hChannelConfig);
+
+    if (status == ERROR_INVALID_DATA) {
+      free(buffer);
+      buffer = NULL;
+      bufferSize = 0;
+
       continue;
+    }
+
+    if (status == ERROR_OUTOFMEMORY) {
+      EvtClose(winevtChannel->channels);
+      winevtChannel->channels = NULL;
+
+      free(buffer);
+      buffer = NULL;
+      bufferSize = 0;
+
+      rb_raise(rb_eRuntimeError, "realloc failed\n");
+    } else if (status != ERROR_SUCCESS) {
+      EvtClose(winevtChannel->channels);
+      winevtChannel->channels = NULL;
+
+      free(buffer);
+      buffer = NULL;
+      bufferSize = 0;
+
+      rb_raise(rb_eRuntimeError, "is_subscribe_channel_p is failed with %ld\n", status);
+    }
 
     utf8str = wstr_to_rb_str(CP_UTF8, buffer, -1);
 

data/lib/winevt/version.rb

@@ -1,3 +1,3 @@
 module Winevt
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

metadata

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