ffi 1.14.0-x86-mingw32 → 1.14.1-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e8184354517195803468a9eba80024040685e79b3c4417d0b0c103d2c469e04
-  data.tar.gz: 1a460d06e141c46aa5392f85fd5318d17295d04ab63907c96965f00d517c3860
+  metadata.gz: 59b764144f02af4cc91789909e7b82d18c942f1ed9b4e525a507d78ace59be0c
+  data.tar.gz: 3a9019cef1c9cd940be2b33d304eef5a8ba8849a6d7ec84e17c9902cc5838495
 SHA512:
-  metadata.gz: 3b7cb006d5f69f2f3aa394cb30493e74b50e6572438826b68778d9e4239c0b32bc7371bddac9741541e535133a141d8a35db00a910fb54d12d470477893ca4d4
-  data.tar.gz: f7585720ce34fb301e2410033d6c282fb1a0176a93858a35476a45912ca90b9ee2972554ab3d464300ed7dfc6d20c85cd9b0d0f3b42c5d85eec3a6f8e25db61d
+  metadata.gz: e07cd563092e4ab9f075cbc354df4598dd911dcfbd350d7939107df264220a9763c5cdd92b9a5d5695197fce23d9e93d2d06bcb8a2f7b3943351ecdf65716ba5
+  data.tar.gz: 051bf4d523f61fd83c787efb3534972b9fc51d6c5598e80ddb76237d49f4cd29d65d6e6fc9d0417dc2710171b52adf1b15c98816d0ba8e1248d51a7527f315bd

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+1.14.1 / 2020-12-19
+-------------------
+
+Changed:
+* Revert changes to FFI::Pointer#write_string made in ffi-1.14.0.
+  It turned out that it can cause hard to find errors. #857
+
+
 1.14.0 / 2020-12-18
 -------------------
 

data/lib/ffi/pointer.rb

@@ -85,37 +85,23 @@ module FFI
     # @param [String] str string to write
     # @param [Numeric] len length of string to return
     # @return [self]
-    # Write +len+ first bytes of +str+ in pointer's contents and a final \0 byte.
+    # Write +len+ first bytes of +str+ in pointer's contents.
     #
     # Same as:
     #  ptr.write_string(str, len)   # with len not nil
     def write_string_length(str, len)
-      write_string(str, len)
+      put_bytes(0, str, 0, len)
     end unless method_defined?(:write_string_length)
 
     # @param [String] str string to write
     # @param [Numeric] len length of string to return
     # @return [self]
-    # Write +str+ in pointer's contents.
-    # If +len+ is given, write the first +len+ bytes of +str+.
-    # In both cases a final \0 byte is written after the string.
+    # Write +str+ in pointer's contents, or first +len+ bytes if 
+    # +len+ is not +nil+.
     def write_string(str, len=nil)
-      if len
-        if len == size
-          warn "[DEPRECATION] Memory too small to write a final 0-byte in #{caller(1, 1)[0]}. This will raise an error in ffi-2.0. Please use write_bytes instead or enlarge the memory region."
-          write_bytes(str, 0, len)
-        else
-          put_char(len, 0) # Check size before writing str
-          write_bytes(str, 0, len)
-        end
-      else
-        if str.bytesize == size
-          warn "[DEPRECATION] Memory too small to write a final 0-byte in #{caller(1, 1)[0]}. This will raise an error in ffi-2.0. Please use write_bytes instead or enlarge the memory region."
-          write_bytes(str)
-        else
-          put_string(0, str)
-        end
-      end
+      len = str.bytesize unless len
+      # Write the string data without NUL termination
+      put_bytes(0, str, 0, len)
     end unless method_defined?(:write_string)
 
     # @param [Type] type type of data to read from pointer's contents

data/lib/ffi/version.rb

@@ -1,3 +1,3 @@
 module FFI
-  VERSION = '1.14.0'
+  VERSION = '1.14.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.1
 platform: x86-mingw32
 authors:
 - Wayne Meissner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+date: 2020-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake