z85 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1409814fc8e3091281bec7c6bda76f7179c27f6f3e95644d668584772de3a057
-  data.tar.gz: b2f6d1afec64d8db0c7fac818359c5174093b15498fb7b80fbc59bdfb2121cb9
+  metadata.gz: fc3a06cd55838caabe94e5669cb0a28d4279f12b9b26e4e78aaf692789b2a24a
+  data.tar.gz: 6b3662ea29821bbb38b0f813b20790f22ad08da30b5bc3a51fe80038b289bf7e
 SHA512:
-  metadata.gz: df15929a429850f26bcaebab4fb7690d47625a8e5fa92eb8acb8952017e9a6ba52fda003977b712249a127a6dfbd0b00e05709f7b59800339ac3e1a1b8f103a5
-  data.tar.gz: abdbac913d2db8aded52cfd67a31a54a6d3e8f9bb1eaf8ed29a1ac8df96a442fc919642399a27b15ca49b156884feb36859686c9f3a17ac068a1da82966c2574
+  metadata.gz: 6a0674ef043853bdf233ccef0dd6536d92469a7f6bad6fdc8929c5dfcd6991dd03dc8f3d377f64f7c98035059ed0abebf85b0c1980e014548f6beba34c10a68f
+  data.tar.gz: c1a1cdacb3348191524c0ce6ee376282abca80c26067639a50329765cf25226758067d575362c740063f7ee8f721ebebd1e4994cbd86af2bd797212d6e6c0849

data/ext/z85/z85.c

@@ -63,18 +63,18 @@ static byte decoder[96] = {
 static VALUE encode(VALUE _mod, VALUE string)
 {
     byte* data = (byte*) StringValuePtr(string);
-    long size = RSTRING_LEN(string);
+    long data_len = RSTRING_LEN(string);
 
-    if (size % 4)
+    if (data_len % 4)
         rb_raise(rb_eRuntimeError, "Invalid string, number of bytes must be a multiple of 4");
 
-    size_t encoded_size = size * 5 / 4;
-    char *encoded = malloc(encoded_size + 1);
+    size_t encoded_len = data_len * 5 / 4;
+    char *encoded = malloc(encoded_len + 1);
     uint char_nbr = 0;
     uint byte_nbr = 0;
     uint32_t value = 0;
 
-    while (byte_nbr < size) {
+    while (byte_nbr < data_len) {
         value = value * 256 + data[byte_nbr++];
         if (byte_nbr % 4 == 0) {
             uint divisor = 85 * 85 * 85 * 85;
@@ -96,18 +96,28 @@ static VALUE encode(VALUE _mod, VALUE string)
 static VALUE _decode(VALUE string, int padding)
 {
     char* data = StringValuePtr(string);
-    long size = RSTRING_LEN(string) - padding;
+    long data_len = RSTRING_LEN(string) - padding;
 
-    if (size % 5)
+    if (data_len % 5)
         rb_raise(rb_eRuntimeError, "Invalid string, number of bytes must be a multiple of 5");
 
-    size_t decoded_size = size * 4 / 5;
+    size_t decoded_size = data_len * 4 / 5;
+
+    /* Verify the counter looks legit before even allocating memory. */
+    if (padding) {
+        int counter = data[data_len] - '0';
+        if (counter < 0 || counter > 3)
+            rb_raise(rb_eRuntimeError, "Invalid padding length");
+        else if (decoded_size < (size_t) counter)
+            rb_raise(rb_eRuntimeError, "Invalid padded string");
+    }
+
     byte* decoded = malloc(decoded_size);
 
     uint byte_nbr = 0;
     uint char_nbr = 0;
     uint32_t value = 0;
-    while (char_nbr < size) {
+    while (char_nbr < data_len) {
         value = value * 85 + decoder[(byte) data[char_nbr++] - 32];
         if (char_nbr % 5 == 0) {
             uint divisor = 256 * 256 * 256;
@@ -119,19 +129,9 @@ static VALUE _decode(VALUE string, int padding)
         }
     }
 
-    VALUE out = 0;
-    if (padding) {
-        int padding_length = data[size] - '0';
-        if (padding_length < 0 || padding_length > 3) {
-          rb_raise(rb_eRuntimeError, "Invalid padding length");
-        } else if (decoded_size >= (size_t) padding_length) {
-            out = rb_str_new((const char*) decoded, decoded_size - padding_length);
-        } else {
-            rb_raise(rb_eRuntimeError, "Invalid padded string");
-        }
-    } else {
-        out = rb_str_new((const char*) decoded, decoded_size);
-    }
+    VALUE out = padding ?
+      rb_str_new((const char*) decoded, decoded_size - (data[data_len] - '0')) :
+      rb_str_new((const char*) decoded, decoded_size);
 
     free(decoded);
 

data/lib/z85.rb

@@ -5,9 +5,9 @@ require "z85/version"
 
 module Z85
   def self.encode_with_padding(string)
-    padding_length = 4 - (string.bytesize % 4)
-    padding_length = 0 if padding_length == 4
-    string += "\0" * padding_length if padding_length > 0
-    encode(string) + padding_length.to_s
+    counter = 4 - (string.bytesize % 4)
+    counter = 0 if counter == 4
+    string += "\0" * counter if counter != 0
+    encode(string) + counter.to_s
   end
 end

data/lib/z85/version.rb

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

metadata

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