ascii85_native 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9c131b0e45806651154e7787963fcf0b66caf3c0d178262fc23fc148bd8f5f8
-  data.tar.gz: 824b411d00c8ef1f02d8cda1073f7f12c705599cd2280a60669f8cd268915cf7
+  metadata.gz: c5a51104b93e100797c8b06a127f666fa26aff4dfa5f6303430b382f1ca2fbff
+  data.tar.gz: 9e5ce38706d633a007ec233d43107b1b363b0b07ce63b0a0dc392a964f428e27
 SHA512:
-  metadata.gz: b659d5d91700f63b9a04df578b8748047cca28a89a5d0105e781c8e0adb8d3f7838c139f394226dbd27612f97a8f2e2986851bcc639e7d2628f6d1883fa508f3
-  data.tar.gz: e299f89e5df890f1294b6fc8d461a265a155f4285767f87e8cc51459003efc2543e73caf5a6260870df42f6e6322ce3da8ee47024fd4eed6a08eb97760d19070
+  metadata.gz: fdc7c43e274d698ea9e60089da2065a9aa63a98ac72ac0a3af2ecbc99e19bbb8d2e0499207e383c6bf9fe46557f38cfd983b1f1e371d06de4a246098048a4715
+  data.tar.gz: 01e94a7a9211549fa30bb5a396129743ce758bfa76d19d11d2371fe5063041dd10cc3260d825a8905b0fea4c78f6a6712da98c6c77b9799984e3516f3656864d

data/ext/ascii85_native/ascii85_native.c

@@ -66,7 +66,7 @@ int a85_decoded_size(int input_length) {
 void a85_decode(const char* input, int input_length, u8* output) {
     while (input_length) {
 
-        while ((*input >= 9 && *input <= 13) || *input == 32) { input++; input_length--;}
+        while ((*input >= 9 && *input <= 13) || *input == 32 || *input == 0) { input++; input_length--;}
 
         if (input_length < 5) {
             // Determine represented value in base 85
@@ -91,15 +91,15 @@ void a85_decode(const char* input, int input_length, u8* output) {
         }
 
         // Determine represented value in base 85 while throwing out invalid ascii85 characters
-        while ((*input >= 9 && *input <= 13) || *input == 32) { input++; input_length--;}
+        while ((*input >= 9 && *input <= 13) || *input == 32 || *input == 0) { input++; input_length--;}
         u32 val = (*(input++) - 33) * 52200625; // 85^4
-        while ((*input >= 9 && *input <= 13) || *input == 32) { input++; input_length--;}
+        while ((*input >= 9 && *input <= 13) || *input == 32 || *input == 0) { input++; input_length--;}
         val += (*(input++) - 33) * 614125; // 85^3
-        while ((*input >= 9 && *input <= 13) || *input == 32) { input++; input_length--;}
+        while ((*input >= 9 && *input <= 13) || *input == 32 || *input == 0) { input++; input_length--;}
         val += (*(input++) - 33) * 7225; // 85^2
-        while ((*input >= 9 && *input <= 13) || *input == 32) { input++; input_length--;}
+        while ((*input >= 9 && *input <= 13) || *input == 32 || *input == 0) { input++; input_length--;}
         val += (*(input++) - 33) * 85; // 85^1
-        while ((*input >= 9 && *input <= 13) || *input == 32) { input++; input_length--;}
+        while ((*input >= 9 && *input <= 13) || *input == 32 || *input == 0) { input++; input_length--;}
         val += (*(input++) - 33); // 85^0
 
         // Write out in big-endian order

data/lib/ascii85_native.rb

@@ -5,7 +5,6 @@ require 'ffi'
 module Ascii85Native
   extend FFI::Library
 
-  ffi_lib 'c'
   ffi_lib File.join(File.dirname(__FILE__), 'ascii85_native.so')
 
   #void a85_encode(const u8* data, int binlen, char* text, bool append_null);
@@ -20,8 +19,6 @@ module Ascii85Native
   #void a85_decode(const char* text, int textlen, u8* data);
   attach_function :a85_decode, [:buffer_in, :int, :buffer_out], :void
 
-  attach_function :strlen, [:buffer_in], :int
-
   def self.encode(input, include_delimiter=false)
     if input.nil? || input.size == 0 
       return '<~~>' if include_delimiter
@@ -69,7 +66,7 @@ module Ascii85Native
       out_size = self.a85_decoded_size(input.size)
 
       FFI::MemoryPointer.new(:uint8, out_size) do |output|
-        self.a85_decode(in_char, strlen(in_char), output)
+        self.a85_decode(in_char, input.size, output)
         return output.read_string()
       end
     end
@@ -80,7 +77,7 @@ module Ascii85Native
     cursor = 0 
 
     input.size.times do |i|
-      if ['\n', '\r', ' '].include?(input[cursor])
+      if ["\n", "\r", ' '].include?(input[cursor])
         cursor += 1
         next
       elsif input[cursor] == '<' && input[cursor+1] == '~'
@@ -99,7 +96,7 @@ module Ascii85Native
     cursor = -1
 
     input.size.times do |i|
-      if ['\n', '\r', ' '].include?(input[cursor])
+      if ["\n", "\r", ' '].include?(input[cursor])
         cursor -= 1
         next
       elsif input[cursor] == '>' && input[cursor-1] == '~'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ascii85_native
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Jason Crossfield
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-05 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi