ffi 1.14.0-x64-mingw32 → 1.14.1-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 614f2331a77eb45762c942a282697e247a86a4b2f97582226893e93cb496bee5
-  data.tar.gz: 1c39548adec97f5c9b7f19518edcf1581583b3a55b11535edfdc7b67031f2a54
+  metadata.gz: 634ac08faa345adcb69704357ca330210cc1a693016e9baa006f24e50a074ced
+  data.tar.gz: e7206eee796d20f6e95af6235c68ad6bd8a9bd63563fab5a05adb9c586d5e304
 SHA512:
-  metadata.gz: 62f122b39e7f8b78fb5e01e6acdbb67f9d0ae009145944b22af0cd1c474cdf0d4afe63c409d644418d66d3135269a979e435c78c3e4df4ec641160e72d6685aa
-  data.tar.gz: 15f60935d1e76db78ef96d6e06de2dfcb2f3151b005083abe1b6fd180fbad3945544d1d344b582529d07401c14d22b7a15d0ad1a03f73592356fc7e6a4a8684b
+  metadata.gz: 1bf9dc354b64cdb522381ac403ababf2ea03a7c81b320c5c8b13106ece4678db3b6dd348c533b4c206fd9e938d912cbd41bc75a64a9cd20ac06ea9f7a60d3804
+  data.tar.gz: b9e4210ee459b68934ebf8b2d44deb53cfcf9821285d62b94e515a656ab20608533382632c6e96ff02510c6f2579255ee537443be3b05ed695926bc97ed3b0ab

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: x64-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