ffi 1.14.0-java → 1.14.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1ab4d534f9cb242444b3ec7042f1b368b8e3d71f54f9503c831b3fa49da5d1b
-  data.tar.gz: 57ba63261c35e46d782160767a6b8239152f5978d5cc2ef66cde3ee76c3974e4
+  metadata.gz: bc00f46ffa7407da24b4a50b20c560916f2ff516661e4c4d95640b7a2fb3d762
+  data.tar.gz: 5029640e78efceeea442c74220053dddfe4a42b37086ae4b06d2f08f63a71bc3
 SHA512:
-  metadata.gz: 044cbed458a7b7fa99ee830a7db1c708cfad04da10b62d28c2f1189e6c251f80c02e614e98fc98c9ab1bac3ffce895eb72bc4114291e648ac698781b694bd99a
-  data.tar.gz: 007624f31a236f1658a957835b377d62bafce078a1a0f19cdffa176a8630db36e8e1c6eefd59ed72ac7266a04d3da2be9519c833073b19f9aa9aad64dba10f1c
+  metadata.gz: 9d992bb52e70d6c41bfab57c1cf8206cd3d4a0de52f694c6aa95454d2e92c866cabfb1670d6a8555c4fe4270f55d866d474fbc300d1d0315e78aab1036cfa6e2
+  data.tar.gz: 12392b64d7f9d3ae06b88eb1e02b66c92cf58b1883811ded8c41c032e6510096aad0a03e8762744e89caa98de4a07c01b7978614950f07e93267b8ea8e146102

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