ffi 1.2.0.pre2 → 1.2.0.pre3

data/Rakefile

@@ -167,6 +167,32 @@ task 'gem:win32' do
 end
 
 
+namespace 'java' do
+
+  java_gem_spec = Gem::Specification.new do |s|
+    s.name = gem_spec.name
+    s.version = gem_spec.version
+    s.author = gem_spec.author
+    s.email = gem_spec.email
+    s.homepage = gem_spec.homepage
+    s.summary = gem_spec.summary
+    s.description = gem_spec.description
+    s.files = %w(History.txt LICENSE COPYING COPYING.LESSER README.md Rakefile)
+    s.has_rdoc = false
+    s.license = gem_spec.license
+    s.platform = 'java'
+  end
+
+  Gem::PackageTask.new(java_gem_spec) do |pkg|
+    pkg.need_zip = true
+    pkg.need_tar = true
+    pkg.package_dir = 'pkg'
+  end
+end
+
+task 'gem:java' => 'java:gem'
+
+
 if USE_RAKE_COMPILER
   Rake::ExtensionTask.new('ffi_c', gem_spec) do |ext|
     ext.name = 'ffi_c'                                        # indicate the name of the extension.

data/ext/ffi_c/Struct.c

@@ -493,7 +493,7 @@ inline_array_size(VALUE self)
 static int
 inline_array_offset(InlineArray* array, int index)
 {
-    if (index < 0 || index >= array->length) {
+    if (index < 0 || (index >= array->length && array->length > 0)) {
         rb_raise(rb_eIndexError, "index %d out of bounds", index);
     }
 

data/ext/ffi_c/StructLayout.c

@@ -388,7 +388,7 @@ struct_layout_initialize(VALUE self, VALUE fields, VALUE size, VALUE align)
         }
 
         ftype = field->type->ffiType;
-        if (ftype->size == 0) {
+        if (ftype->size == 0 && i < ((int) layout->fieldCount - 1)) {
             rb_raise(rb_eTypeError, "type of field %d has zero size", i);
         }
 
@@ -396,7 +396,8 @@ struct_layout_initialize(VALUE self, VALUE fields, VALUE size, VALUE align)
             field->referenceIndex = layout->referenceFieldCount++;
         }
 
-        layout->ffiTypes[i] = ftype;
+
+        layout->ffiTypes[i] = ftype->size > 0 ? ftype : NULL;
         st_insert(layout->fieldSymbolTable, rbName, rbField);
         rb_hash_aset(layout->rbFieldMap, rbName, rbField);
         rb_ary_push(layout->rbFields, rbField);

data/lib/Lib.iml

@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v0.8.7, RVM: ruby-1.8.7-p357) [gem]" level="application" />
   </component>
 </module>
 

data/spec/ffi/buffer_spec.rb

@@ -171,6 +171,43 @@ describe "Reading/Writing binary strings" do
     str = "hello\0world"
     buf = FFI::Buffer.new 1024
     lambda { buf.put_bytes(0, str, -1, 12); }.should raise_error
+   end
+
+  it "Buffer#write_bytes" do
+    str = "hello\0world"
+    buf = FFI::Buffer.new 1024
+    buf.write_bytes(str)
+    s2 = buf.get_bytes(0, 11)
+    s2.should eq str
+  end
+  it "Buffer#write_bytes with index and length" do
+    str = "hello\0world"
+    buf = FFI::Buffer.new 1024
+    buf.write_bytes(str, 5, 6)
+    s2 = buf.get_bytes(0, 6)
+    s2.should eq str[5..-1]
+  end
+  it "Buffer#write_bytes with only index" do
+    str = "hello\0world"
+    buf = FFI::Buffer.new 1024
+    buf.write_bytes(str, 5)
+    s2 = buf.get_bytes(0, 6)
+    s2.should eq str[5..-1]
+  end
+  it "Buffer#write_bytes with index > str.length" do
+    str = "hello\0world"
+    buf = FFI::Buffer.new 1024
+    lambda { buf.write_bytes(str, 12) }.should raise_error
+  end
+  it "Buffer#put_bytes with length > str.length" do
+    str = "hello\0world"
+    buf = FFI::Buffer.new 1024
+    lambda { buf.put_bytes(0, str, 0, 12) }.should raise_error
+  end
+   it "Buffer#write_bytes with negative index" do
+    str = "hello\0world"
+    buf = FFI::Buffer.new 1024
+    lambda { buf.write_bytes(str, -1, 12) }.should raise_error
   end
 end
 describe "Reading/Writing ascii strings" do

data/spec/ffi/struct_spec.rb

@@ -717,3 +717,43 @@ describe "Struct allocation" do
   end
 
 end
+
+describe "variable-length arrays" do
+  it "zero length array should be accepted as last field" do
+    lambda {
+      Class.new(FFI::Struct) do
+        layout :count, :int, :data, [ :char, 0 ]
+      end
+    }.should_not raise_error
+  end
+
+  it "zero length array before last element should raise error" do
+    lambda {
+      Class.new(FFI::Struct) do
+        layout :data, [ :char, 0 ], :count, :int
+      end
+    }.should raise_error
+  end
+
+  it "can access elements of array" do
+    struct_class = Class.new(FFI::Struct) do
+      layout :count, :int, :data, [ :long, 0 ]
+    end
+    s = struct_class.new(FFI::MemoryPointer.new(1024))
+    s[:data][0] = 0xdeadbeef
+    s[:data][1] = 0xfee1dead
+    s[:data][0].should eq 0xdeadbeef
+    s[:data][1].should eq 0xfee1dead
+  end
+
+  it "non-variable length array is bounds checked" do
+    struct_class = Class.new(FFI::Struct) do
+      layout :count, :int, :data, [ :long, 1 ]
+    end
+    s = struct_class.new(FFI::MemoryPointer.new(1024))
+    s[:data][0] = 0xdeadbeef
+    lambda { s[:data][1] = 0xfee1dead }.should raise_error
+    s[:data][0].should eq 0xdeadbeef
+    lambda { s[:data][1].should eq 0xfee1dead }.should raise_error
+  end
+end

metadata

@@ -1,78 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ffi
-version: !ruby/object:Gem::Version 
-  hash: -1049754034
+version: !ruby/object:Gem::Version
+  version: 1.2.0.pre3
   prerelease: 6
-  segments: 
-  - 1
-  - 2
-  - 0
-  - pre
-  - 2
-  version: 1.2.0.pre2
 platform: ruby
-authors: 
+authors:
 - Wayne Meissner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-01 00:00:00 +11:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake-compiler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby FFI library
 email: wmeissner@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/ffi_c/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - History.txt
 - LICENSE
 - COPYING
@@ -507,45 +500,31 @@ files:
 - libtest/StructTest.c
 - libtest/UnionTest.c
 - libtest/VariadicTest.c
-has_rdoc: true
 homepage: http://wiki.github.com/ffi/ffi
-licenses: 
+licenses:
 - LGPL-3
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - lib/ffi
 - ext/ffi_c
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby FFI
 test_files: []
-