z85 0.7 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c6f7125b81693238b15334de72ed53b7d5cd65042273ad901d364f4e86cedd3
-  data.tar.gz: 56fdb2a0418c6d7a9dbfa23532df79a807592b37883ffe689e2a0e4bc4eb2dd1
+  metadata.gz: 6e683619c908d319f091ecaadc76c7e59786da2d7226063e7ea876dd14fffbd8
+  data.tar.gz: e4b648c8f706318a8c47bd150e713308da299d02e4814a604ef9bbe9cabe0a80
 SHA512:
-  metadata.gz: a801396bddf699a1b86b6824f845446d6ff61437d43f8527e4052f40d49b72e1262f825fd284d0ee0d8a4127d11c14bf2f8c616018ae77db1030a3625e12da27
-  data.tar.gz: e5635d024cb662493fe6134e4c35a56435f2924fb26884476f9f9409f9a0579f9df3fa733bd3727dcf8cb5e5b619520c4c15da0d1af9e9c29aef93460a56cb3f
+  metadata.gz: ece12a6308cb55fd09ba0f698b15090037e512487e2d70c510ec0132d6c38c062a47707f32ef3939628790774405fb3dc36664a2d914b054e1e915f6deaba378
+  data.tar.gz: 1aa6f0004fb069b400ff31306ed5a035ddceb96a8efb1c8c16514c5bdc4cf1b331205556d2a70edc9dfe7340d73e3af161ba9824f45efd87a331042563fce9b6

data/ext/z85/z85.c

@@ -60,13 +60,28 @@ static byte decoder[96] = {
     0x21, 0x22, 0x23, 0x4F, 0x00, 0x50, 0x00, 0x00
 };
 
-static VALUE Z85_encode(VALUE _mod, VALUE string)
+static void* z85_malloc(size_t size)
+{
+    void* ptr = malloc(size);
+
+    /*
+      malloc(0) is implementation-defined and could return NULL, so if ptr is
+      NULL, we need to check size too before raising. Note that free(NULL) is
+      valid (it does nothing).
+    */
+    if (!ptr && size)
+      rb_raise(rb_eNoMemError, "Out of memory");
+
+    return ptr;
+}
+
+static VALUE z85_encode(VALUE _mod, VALUE string)
 {
     byte* data = (byte*) StringValuePtr(string);
     long size = RSTRING_LEN(string);
 
     size_t encoded_len = size * 5 / 4;
-    char *encoded = malloc(encoded_len + 1);
+    char* encoded = z85_malloc(encoded_len + 1);
     uint char_nbr = 0;
     uint byte_nbr = 0;
     uint32_t value = 0;
@@ -89,7 +104,7 @@ static VALUE Z85_encode(VALUE _mod, VALUE string)
     return out;
 }
 
-static VALUE Z85_decode(VALUE _mod, VALUE rstring)
+static VALUE z85_decode(VALUE _mod, VALUE rstring)
 {
     char* string = StringValuePtr(rstring);
     long strlen = RSTRING_LEN(rstring);
@@ -97,7 +112,7 @@ static VALUE Z85_decode(VALUE _mod, VALUE rstring)
       strlen--; /* It is padded, ignore the counter */
 
     size_t decoded_size = strlen * 4 / 5;
-    byte* decoded = malloc(decoded_size);
+    byte* decoded = z85_malloc(decoded_size);
 
     uint byte_nbr = 0;
     uint char_nbr = 0;
@@ -123,7 +138,8 @@ static VALUE Z85_decode(VALUE _mod, VALUE rstring)
 void Init_z85()
 {
     VALUE z85 = rb_define_module("Z85");
+    VALUE z85_singleton_class = rb_singleton_class(z85);
 
-    rb_define_singleton_method(z85, "_encode", Z85_encode, 1);
-    rb_define_singleton_method(z85, "_decode", Z85_decode, 1);
+    rb_define_private_method(z85_singleton_class, "_encode", z85_encode, 1);
+    rb_define_private_method(z85_singleton_class, "_decode", z85_decode, 1);
 }

data/lib/z85.rb

@@ -16,34 +16,54 @@ module Z85
 
     def encode(string)
       if string.bytesize % 4 != 0
-        err "Input length should be 0 mod 4. Please, check Z85.encode_with_padding."
+        err "Number of bytes should be 0 mod 4. Please, check Z85.encode_with_padding."
       end
+
       _encode(string)
     end
 
     def encode_with_padding(string)
-      counter = 4 - (string.bytesize % 4)
-      counter == 4 ? _encode(string) + "0" : _encode(string + PADDINGS[counter]) + counter.to_s
+      n  = 4 - (string.bytesize % 4)
+      n == 4 ? _encode(string) + "0" : _encode(string + PADDINGS[n]) + n.to_s
     end
 
     def decode(string)
       if string.bytesize % 5 != 0
         err "Input length should be 0 mod 5. Please, check Z85.decode_with_padding."
       end
+
       _decode(string)
     end
 
     def decode_with_padding(string)
-      err "Input length should be 1 mod 5" if string.bytesize % 5 != 1
-
-      counter = string[-1]
-      err "Invalid counter: #{counter}" if counter < "0" || counter > "3"
+      if string.bytesize % 5 != 1
+        err "Input length should be 1 mod 5"
+      end
 
+      counter = extract_counter(string)
       decoded = _decode(string)
-      size = decoded.bytesize - counter.to_i
-      err "String too short for counter #{counter}" if size < 0
 
-      decoded.slice!(0, size)
+      begin
+        decoded[-counter, counter] = ""
+      rescue IndexError
+        err "String too short for counter #{counter}"
+      end
+
+      decoded
+    end
+
+    private def extract_counter(string)
+      begin
+        counter = Integer(string[-1])
+      rescue ArgumentError
+        err "Invalid counter: #{string[-1]}"
+      end
+
+      if counter <= 3
+        counter
+      else
+        err "Invalid counter: #{counter}"
+      end
     end
   end
 end

data/lib/z85/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Z85
-  VERSION = "0.7"
+  VERSION = "0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: z85
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - Xavier Noria
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2019-08-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: fxn@hashref.com