win32-eventlog 0.4.7 → 0.4.8

data/CHANGES

@@ -1,4 +1,11 @@
-= 0.4.7 - 8-Dec-2008
+= 0.4.8 - 17-May-2008
+* Fixed in a bug in the EventLog#read method where a log entry requiring
+  over 64k would fail and spiral into an infinite loop. Thanks go to
+  Stuart Clarke for the spot.
+* Improved handling of failed log reading in the read_last_event private
+  method.
+
+= 0.4.7 - 8-Dec-2007
 * Fixed a bug where you couldn't write to custom (parent) event sources.
   Thanks go to Tim Uckun for the spot.
 * Now handles ParameterMessageFiles, both in the EventLog.add_event_source

data/lib/win32/eventlog.rb

@@ -37,7 +37,7 @@ module Win32
       extend Windows::Error
       extend Windows::Registry
       
-      VERSION = '0.4.7'
+      VERSION = '0.4.8'
       
       # Aliased read flags
       FORWARDS_READ   = EVENTLOG_FORWARDS_READ
@@ -536,8 +536,7 @@ module Win32
       # If no block is given the method returns an array of EventLogStruct's.
       # 
       def read(flags = nil, offset = 0)
-         buf    = 0.chr * BUFFER_SIZE # 64k buffer 
-         size   = buf.size      
+         buf    = 0.chr * BUFFER_SIZE # 64k buffer      
          read   = [0].pack('L')
          needed = [0].pack('L')
          array  = []
@@ -555,12 +554,14 @@ module Win32
             lkey = hkey.unpack('L').first
          end
          
-         while ReadEventLog(@handle, flags, offset, buf, size, read, needed) ||
+         while ReadEventLog(@handle, flags, offset, buf, buf.size, read, needed) ||
             GetLastError() == ERROR_INSUFFICIENT_BUFFER
             
             if GetLastError() == ERROR_INSUFFICIENT_BUFFER
-               buf += 0.chr * needed.unpack('L')[0]
-               ReadEventLog(@handle, flags, offset, buf, size, read, needed)
+               buf = (0.chr * buf.size) + (0.chr * needed.unpack('L')[0])
+               unless ReadEventLog(@handle, flags, offset, buf, buf.size, read, needed)
+                  raise Error, get_last_error
+               end
             end
                        
             dwread = read.unpack('L')[0]
@@ -721,7 +722,18 @@ module Win32
          lkey   = HKEY_LOCAL_MACHINE
     
          flags = EVENTLOG_BACKWARDS_READ | EVENTLOG_SEQUENTIAL_READ
-         ReadEventLog(@handle, flags, 0, buf, buf.size, read, needed)
+         
+         unless ReadEventLog(@handle, flags, 0, buf, buf.size, read, needed)
+            error = GetLastError()
+            if error == ERROR_INSUFFICIENT_BUFFER
+               buf = (0.chr * buf.size) + (0.chr * needed.unpack('L')[0])
+               unless ReadEventLog(@handle, flags, 0, buf, buf.size, read, needed)
+                  raise Error, get_last_error
+               end
+            else
+               raise Error, get_last_error(error)
+            end
+         end
 
          if @server
             hkey = [0].pack('L')

data/test/tc_eventlog.rb

@@ -23,7 +23,7 @@ class TC_EventLog < Test::Unit::TestCase
    end
  
    def test_version
-      assert_equal('0.4.7', EventLog::VERSION)
+      assert_equal('0.4.8', EventLog::VERSION)
    end
    
    # Use the alias to validate it as well.

data/win32-eventlog.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 spec = Gem::Specification.new do |gem|
    gem.name        = "win32-eventlog"
-   gem.version     = "0.4.7"
+   gem.version     = "0.4.8"
    gem.author      = "Daniel J. Berger"
    gem.email       = "djberg96@gmail.com"
    gem.homepage    = "http://www.rubyforge.org/projects/win32utils"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: win32-eventlog
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-08 00:00:00 -07:00
+date: 2008-05-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 0.9.5
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Interface for the MS Windows Event Log.