win32-file-stat 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7764a39e8f403c83d964b00692f7b73601145333
-  data.tar.gz: 5226d81304b3962ecfce5b62169cb162ce1b2450
+  metadata.gz: 23250fff2376ccd7a6065cdcae48c6e81c07df90
+  data.tar.gz: a9a131d44a673112885963b6d29073ad92c11d48
 SHA512:
-  metadata.gz: 55089202def036b4a370e22ec1e22f3b123528707f74384cdfd61ed60c130cd516dde0f1f92413d43fb5e062f78f3a96dc929f27ed8a4f7d419f638a72e1d210
-  data.tar.gz: 33a8579a2ebe3fe232d7e9145d43024469d8e8d7ad1738257f9232f43476472514220990606f520eed33fb737298b8e7bd55fb11c6061fa87fffaa0697e40394
+  metadata.gz: 5f891648fed03bc03c47810ba2e556d24cb1575791dcc4c305ce704cc9495f8116fd22d7e16c382af8cb537ff9f7302628bf5828604fd0168c5a89cdcf58d431
+  data.tar.gz: a493ed6f9733b4cd62e23918bc6dfa495666c42b9fc47044198ab46e498341da68cf4576aa60ff63872c402bd404db23a9af570c58119d4412a4de816b1022cd

data/CHANGES

@@ -1,3 +1,9 @@
+== 1.5.4 - 7-Jun-2016
+* It was possible that an internal FFI function (GetTokenInformation) could
+  fail if the buffer size wasn't large enough. That has been fixed. Thanks
+  go to ferfebles and Michael Lowell Roberts for the spot.
+* Added an appveyor.yml file.
+
 == 1.5.3 - 25-May-2016
 * This gem is now signed.
 * The local helper file has been replaced by ffi-win32-extensions, which

data/MANIFEST

@@ -1,8 +1,10 @@
+* appveyor.yml
 * CHANGES
-* README
 * MANIFEST
 * Rakefile
+* README
 * win32-file-stat.gemspec
+* certs/djberg96_pub.pem
 * lib/win32/file/stat.rb
 * lib/win32/file/windows/constants.rb
 * lib/win32/file/windows/functions.rb

data/README

@@ -79,7 +79,7 @@
   http://www.gittip.com/djberg96/
 
 == Copyright
-  (C) 2003-2015, Daniel J. Berger, All Rights Reserved.
+  (C) 2003-2016, Daniel J. Berger, All Rights Reserved.
 
 == License
   Artistic 2.0

data/appveyor.yml

@@ -0,0 +1,48 @@
+version: '{build}'
+branches:
+  only:
+  - ffi2
+skip_tags: true
+clone_depth: 10
+environment:
+  matrix:
+  - ruby_version: 193
+    ruby_dir: 1.9.1
+  - ruby_version: 200
+    ruby_dir: 2.0.0
+  - ruby_version: 200-x64
+    ruby_dir: 2.0.0
+  - ruby_version: 21
+    ruby_dir: 2.1.0
+  - ruby_version: 21-x64
+    ruby_dir: 2.1.0
+  - ruby_version: 22
+    ruby_dir: 2.2.0
+  - ruby_version: 22-x64
+    ruby_dir: 2.2.0
+install:
+- ps: >-
+    $env:path = "C:\Ruby" + $env:ruby_version + "\bin;" + $env:path
+
+    $tpath = "C:\Ruby" + $env:ruby_version + "\lib\ruby\" + $env:ruby_dir + "\test"
+
+    if ((test-path $tpath) -eq $True){ rm -recurse -force $tpath }
+
+    gem update --system > $null
+
+    if ((gem query -i ffi-win32-extensions) -eq $False){ gem install ffi-win32-extensions --no-document }
+
+    if ((gem query -i win32-security) -eq $False){ gem install win32-security --no-document }
+
+    if ((gem query -i test-unit -v ">= 3.0") -eq $False){ gem install test-unit --no-document }
+cache:
+- C:\Ruby193\lib\ruby\gems\1.9.1
+- C:\Ruby200\lib\ruby\gems\2.0.0
+- C:\Ruby200-x64\lib\ruby\gems\2.0.0
+- C:\Ruby21\lib\ruby\gems\2.1.0
+- C:\Ruby21-x64\lib\ruby\gems\2.1.0
+- C:\Ruby22\lib\ruby\gems\2.2.0
+- C:\Ruby22-x64\lib\ruby\gems\2.2.0
+build: off
+test_script:
+- cmd: rake

data/lib/win32/file/stat.rb

@@ -58,7 +58,7 @@ class File::Stat
   attr_reader :streams
 
   # The version of the win32-file-stat library
-  WIN32_FILE_STAT_VERSION = '1.5.3'
+  WIN32_FILE_STAT_VERSION = '1.5.4'
 
   # Creates and returns a File::Stat object, which encapsulate common status
   # information for File objects on MS Windows sytems. The information is
@@ -815,22 +815,29 @@ class File::Stat
 
     begin
       token = token.read_pointer.to_i
-      rlength = FFI::MemoryPointer.new(:pointer)
+      rlength = FFI::MemoryPointer.new(:ulong)
 
       if token_type == TokenUser
-        buf = 0.chr * 512
+        info = TOKEN_USER.new
       else
-        buf = TOKEN_GROUP.new
+        info = TOKEN_GROUP.new
       end
 
-      unless GetTokenInformation(token, token_type, buf, buf.size, rlength)
-        raise SystemCallError.new("GetTokenInformation", FFI.errno)
+      bool = GetTokenInformation(token, token_type, info, info.size, rlength)
+
+      if !bool && FFI.errno == ERROR_INSUFFICIENT_BUFFER
+        info = FFI::MemoryPointer.new(rlength.read_ulong)
+        rlength.clear
+        bool = GetTokenInformation(token, token_type, info, info.size, rlength)
+        info = TOKEN_USER.new(info) if bool
       end
 
+      raise SystemCallError.new('GetTokenInformation', FFI.errno) unless bool
+
       if token_type == TokenUser
-        tsid = buf[FFI.type_size(:pointer)*2, (rlength.read_ulong - FFI.type_size(:pointer)*2)]
+        tsid = info[:User][:Sid]
       else
-        tsid = buf[:Groups][0][:Sid]
+        tsid = info[:Groups][0][:Sid]
       end
 
       ptr = FFI::MemoryPointer.new(:string)

data/lib/win32/file/windows/structs.rb

@@ -152,6 +152,12 @@ module Windows
         )
       end
 
+      class TOKEN_USER < FFI::Struct
+        layout(
+          :User, SID_AND_ATTRIBUTES
+        )
+      end
+
       class GENERIC_MAPPING < FFI::Struct
         layout(
           :GenericRead, :ulong,

data/test/test_file_stat.rb

@@ -54,7 +54,7 @@ class TC_Win32_File_Stat < Test::Unit::TestCase
   end
 
   test "version is set to expected value" do
-    assert_equal('1.5.3', File::Stat::WIN32_FILE_STAT_VERSION)
+    assert_equal('1.5.4', File::Stat::WIN32_FILE_STAT_VERSION)
   end
 
   test "constructor does not modify argument" do

data/win32-file-stat.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name       = 'win32-file-stat'
-  spec.version    = '1.5.3'
+  spec.version    = '1.5.4'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob']
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-file-stat
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -31,7 +31,7 @@ cert_chain:
   EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
   tGSHgAmcLlkdGgan182qsE/4kKM=
   -----END CERTIFICATE-----
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -117,6 +117,7 @@ extra_rdoc_files:
 - CHANGES
 - MANIFEST
 files:
+- appveyor.yml
 - certs
 - certs/djberg96_pub.pem
 - CHANGES