ffi 1.14.0 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c0a1872f48b6db1c64ae5390e0e76455fa27ae7016e5a0426753e4973b53751
-  data.tar.gz: 2e9a65f7e151185182a42848eebbd0709fee683d3513e096c7552a669a5326a6
+  metadata.gz: f68e0ecc4224facba03b0beca4e4c4ffd6faf1623c4ec9504385b58a0924de7b
+  data.tar.gz: 5f12a1c79784adab54bc4bb4e8f535942b089d1114ab00ea5ffecfda357d6794
 SHA512:
-  metadata.gz: 9c78c1d0e46f1bcc9e0ff29dafadb660970ff86f54fb5326dc63e81eecee307e9e22e187c07dc2f9982ffff7c3a3c913caaeb2136683f5990466d452b87ec23c
-  data.tar.gz: a5c06fa33eb31dd59f26ee10796609bfee821d076107e5f6ac2ab131f39fbb4979d00f84d98e1e556268ee55f310f8bbda1c770d0af5b98d72b314c1fdd9b0a1
+  metadata.gz: 593a0a50659343c3d0d21b26ea8d53d76bf10f36c40274746f77c85b5d2d6088c199ca904134c9c094172beaa8461caf8bd101d2f8cda0fb7e90d1838c3b14a7
+  data.tar.gz: 5d18bb9ed0fb4284613ea107745aa987a5f7545e6fc4e30db1232aabd9418c6af9c0f4916f1eafba95d6911454524841ae108485c5862a3db255488e58fa63fb

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/ext/ffi_c/AbstractMemory.c

@@ -499,7 +499,7 @@ memory_read_array_of_string(int argc, VALUE* argv, VALUE self)
  * @raise {SecurityError} when writing unsafe string to memory
  * @raise {IndexError} if +offset+ is too great
  * @raise {NullPointerError} if memory not initialized
- * Put a string in memory. Writes a final \0 byte.
+ * Put a string in memory.
  */
 static VALUE
 memory_put_string(VALUE self, VALUE offset, VALUE str)

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