msgpack 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08b929d16e3f5eb48b0de6a10041092be2510361
-  data.tar.gz: 34c606ea1c703c22f94d1295b5648f4430fd69ae
+  metadata.gz: 0ca0c3abd8883f5ba34b519986e789b6e029505a
+  data.tar.gz: 2d8db1bcaeccbccebe206b99cdd361e7c32621a9
 SHA512:
-  metadata.gz: 4ec69a5b4e904359b7c1d1a15f37ee2e57fa5e340fbab0e658cf2d476d736d41100cd350ce580f52afbbb88721640be3bd120583adfd6f179aa1b3afa4395142
-  data.tar.gz: 63bf4dd13deaa7c767bbc1f6c50170548cb6819ebb2ca87282939f6cd88da078820af2453634dcb0e4c3d056073807f34ac86623c5b75ec89ea416ed8fa6f7c1
+  metadata.gz: f1adc454c670e6cb401bf103f389b0d3cff36f644bb1eeb57a2795c6757718a9124cb09c71a56a38e4a22345aec4a1f18178e45407fa5528566e762abaf3dc48
+  data.tar.gz: 820785bf3360304db2d1011d108fbc167a827c07b43b3a17f0f9c6359a734aa6572f01c72946af6f6be923266c3d0e47e148009f557875cf66ecf8ce57f47a3c

data/.travis.yml

@@ -13,6 +13,8 @@ os:
   - linux
   - osx
 
+sudo: false
+
 branches:
   only:
     - master

data/ChangeLog

@@ -1,3 +1,7 @@
+2015-11-20 version 0.7.1:
+
+* Fixed bug to pack/unpack ext type objects larger than 256bytes incorrectly.
+
 2015-10-24 version 0.7.0:
 
 * Add extention types support.

data/doclib/msgpack.rb

@@ -73,5 +73,15 @@ module MessagePack
   #
   def self.unpack(src, options={})
   end
+
+  #
+  # An instance of Factory class. DefaultFactory is also used
+  # by global pack/unpack methods such as MessagePack.dump/load,
+  # Hash#to_msgpack, and other to_msgpack methods.
+  #
+  # Calling DefaultFactory.register_type lets you add an extension
+  # type globally.
+  #
+  DefaultFactory = Factory.new
 end
 

data/ext/java/org/msgpack/jruby/Decoder.java

@@ -236,8 +236,8 @@ public class Decoder implements Iterator<IRubyObject> {
         case BIN8:     return consumeString(buffer.get() & 0xff, binaryEncoding);
         case BIN16:    return consumeString(buffer.getShort() & 0xffff, binaryEncoding);
         case BIN32:    return consumeString(buffer.getInt(), binaryEncoding);
-        case VAREXT8:  return consumeExtension(buffer.get());
-        case VAREXT16: return consumeExtension(buffer.getShort());
+        case VAREXT8:  return consumeExtension(buffer.get() & 0xff);
+        case VAREXT16: return consumeExtension(buffer.getShort() & 0xffff);
         case VAREXT32: return consumeExtension(buffer.getInt());
         case FLOAT32:  return runtime.newFloat(buffer.getFloat());
         case FLOAT64:  return runtime.newFloat(buffer.getDouble());

data/ext/msgpack/buffer.c

@@ -74,13 +74,13 @@ static void _msgpack_buffer_chunk_destroy(msgpack_buffer_chunk_t* c)
     if(c->mem != NULL) {
 #ifndef DISABLE_RMEM
         if(!msgpack_rmem_free(&s_rmem, c->mem)) {
-            free(c->mem);
+            xfree(c->mem);
         }
         /* no needs to update rmem_owner because chunks will not be
          * free()ed (left in free_list) and thus *rmem_owner is
          * always valid. */
 #else
-        free(c->mem);
+        xfree(c->mem);
 #endif
     }
     c->first = NULL;
@@ -95,7 +95,7 @@ void msgpack_buffer_destroy(msgpack_buffer_t* b)
     while(c != &b->tail) {
         msgpack_buffer_chunk_t* n = c->next;
         _msgpack_buffer_chunk_destroy(c);
-        free(c);
+        xfree(c);
         c = n;
     }
     _msgpack_buffer_chunk_destroy(c);
@@ -103,7 +103,7 @@ void msgpack_buffer_destroy(msgpack_buffer_t* b)
     c = b->free_list;
     while(c != NULL) {
         msgpack_buffer_chunk_t* n = c->next;
-        free(c);
+        xfree(c);
         c = n;
     }
 }
@@ -259,7 +259,7 @@ static inline msgpack_buffer_chunk_t* _msgpack_buffer_alloc_new_chunk(msgpack_bu
 {
     msgpack_buffer_chunk_t* reuse = b->free_list;
     if(reuse == NULL) {
-        return malloc(sizeof(msgpack_buffer_chunk_t));
+        return xmalloc(sizeof(msgpack_buffer_chunk_t));
     }
     b->free_list = b->free_list->next;
     return reuse;
@@ -403,7 +403,7 @@ static inline void* _msgpack_buffer_chunk_malloc(
 
     // TODO alignment?
     *allocated_size = required_size;
-    void* mem = malloc(required_size);
+    void* mem = xmalloc(required_size);
     c->mem = mem;
     return mem;
 }
@@ -421,7 +421,7 @@ static inline void* _msgpack_buffer_chunk_realloc(
         next_size *= 2;
     }
     *current_size = next_size;
-    mem = realloc(mem, next_size);
+    mem = xrealloc(mem, next_size);
 
     c->mem = mem;
     return mem;

data/ext/msgpack/buffer_class.c

@@ -49,7 +49,7 @@ static void Buffer_free(void* data)
     }
     msgpack_buffer_t* b = (msgpack_buffer_t*) data;
     msgpack_buffer_destroy(b);
-    free(b);
+    xfree(b);
 }
 
 static VALUE Buffer_alloc(VALUE klass)

data/ext/msgpack/factory_class.c

@@ -48,7 +48,7 @@ static void Factory_free(msgpack_factory_t* fc)
     }
     msgpack_packer_ext_registry_destroy(&fc->pkrg);
     msgpack_unpacker_ext_registry_destroy(&fc->ukrg);
-    free(fc);
+    xfree(fc);
 }
 
 void Factory_mark(msgpack_factory_t* fc)

data/ext/msgpack/packer.h

@@ -364,7 +364,7 @@ static inline void msgpack_packer_write_ext(msgpack_packer_t* pk, int ext_type,
         msgpack_buffer_write_2(PACKER_BUFFER_(pk), 0xd8, ext_type);
         break;
     default:
-        if(len < 255) {
+        if(len < 256) {
             msgpack_buffer_ensure_writable(PACKER_BUFFER_(pk), 3);
             msgpack_buffer_write_2(PACKER_BUFFER_(pk), 0xc7, len);
             msgpack_buffer_write_1(PACKER_BUFFER_(pk), ext_type);

data/ext/msgpack/packer_class.c

@@ -45,7 +45,7 @@ static void Packer_free(msgpack_packer_t* pk)
     }
     msgpack_packer_ext_registry_destroy(&pk->ext_registry);
     msgpack_packer_destroy(pk);
-    free(pk);
+    xfree(pk);
 }
 
 static void Packer_mark(msgpack_packer_t* pk)

data/ext/msgpack/rmem.c

@@ -21,7 +21,7 @@
 void msgpack_rmem_init(msgpack_rmem_t* pm)
 {
     memset(pm, 0, sizeof(msgpack_rmem_t));
-    pm->head.pages = malloc(MSGPACK_RMEM_PAGE_SIZE * 32);
+    pm->head.pages = xmalloc(MSGPACK_RMEM_PAGE_SIZE * 32);
     pm->head.mask = 0xffffffff;  /* all bit is 1 = available */
 }
 
@@ -30,10 +30,10 @@ void msgpack_rmem_destroy(msgpack_rmem_t* pm)
     msgpack_rmem_chunk_t* c = pm->array_first;
     msgpack_rmem_chunk_t* cend = pm->array_last;
     for(; c != cend; c++) {
-        free(c->pages);
+        xfree(c->pages);
     }
-    free(pm->head.pages);
-    free(pm->array_first);
+    xfree(pm->head.pages);
+    xfree(pm->array_first);
 }
 
 void* _msgpack_rmem_alloc2(msgpack_rmem_t* pm)
@@ -56,7 +56,7 @@ void* _msgpack_rmem_alloc2(msgpack_rmem_t* pm)
         size_t capacity = c - pm->array_first;
         size_t length = last - pm->array_first;
         capacity = (capacity == 0) ? 8 : capacity * 2;
-        msgpack_rmem_chunk_t* array = realloc(pm->array_first, capacity * sizeof(msgpack_rmem_chunk_t));
+        msgpack_rmem_chunk_t* array = xrealloc(pm->array_first, capacity * sizeof(msgpack_rmem_chunk_t));
         pm->array_first = array;
         pm->array_last = array + length;
         pm->array_end = array + capacity;
@@ -71,7 +71,7 @@ void* _msgpack_rmem_alloc2(msgpack_rmem_t* pm)
     *c = tmp;
 
     pm->head.mask = 0xffffffff & (~1);  /* "& (~1)" means first chunk is already allocated */
-    pm->head.pages = malloc(MSGPACK_RMEM_PAGE_SIZE * 32);
+    pm->head.pages = xmalloc(MSGPACK_RMEM_PAGE_SIZE * 32);
 
     return pm->head.pages;
 }
@@ -81,7 +81,7 @@ void _msgpack_rmem_chunk_free(msgpack_rmem_t* pm, msgpack_rmem_chunk_t* c)
     if(pm->array_first->mask == 0xffffffff) {
         /* free and move to last */
         pm->array_last--;
-        free(c->pages);
+        xfree(c->pages);
         *c = *pm->array_last;
         return;
     }

data/ext/msgpack/unpacker.c

@@ -68,7 +68,7 @@ void _msgpack_unpacker_init(msgpack_unpacker_t* uk)
     /*memset(uk->stack, 0, MSGPACK_UNPACKER_STACK_CAPACITY);*/
 #else
     /*uk->stack = calloc(MSGPACK_UNPACKER_STACK_CAPACITY, sizeof(msgpack_unpacker_stack_t));*/
-    uk->stack = malloc(MSGPACK_UNPACKER_STACK_CAPACITY * sizeof(msgpack_unpacker_stack_t));
+    uk->stack = xmalloc(MSGPACK_UNPACKER_STACK_CAPACITY * sizeof(msgpack_unpacker_stack_t));
 #endif
     uk->stack_capacity = MSGPACK_UNPACKER_STACK_CAPACITY;
 }
@@ -78,7 +78,7 @@ void _msgpack_unpacker_destroy(msgpack_unpacker_t* uk)
 #ifdef UNPACKER_STACK_RMEM
     msgpack_rmem_free(&s_stack_rmem, uk->stack);
 #else
-    free(uk->stack);
+    xfree(uk->stack);
 #endif
 
     msgpack_buffer_destroy(UNPACKER_BUFFER_(uk));
@@ -380,7 +380,7 @@ static int read_primitive(msgpack_unpacker_t* uk)
         case 0xc8: // ext 16
             {
                 READ_CAST_BLOCK_OR_RETURN_EOF(cb, uk, 3);
-                uint16_t length = cb->u16;
+                uint16_t length = _msgpack_be16(cb->u16);
                 int ext_type = cb->buffer[2];
                 if(length == 0) {
                     return object_complete_ext(uk, ext_type, rb_str_buf_new(0));
@@ -392,7 +392,7 @@ static int read_primitive(msgpack_unpacker_t* uk)
         case 0xc9: // ext 32
             {
                 READ_CAST_BLOCK_OR_RETURN_EOF(cb, uk, 5);
-                uint32_t length = cb->u32;
+                uint32_t length = _msgpack_be32(cb->u32);
                 int ext_type = cb->buffer[4];
                 if(length == 0) {
                     return object_complete_ext(uk, ext_type, rb_str_buf_new(0));

data/ext/msgpack/unpacker_class.c

@@ -47,7 +47,7 @@ static void Unpacker_free(msgpack_unpacker_t* uk)
     }
     msgpack_unpacker_ext_registry_destroy(&uk->ext_registry);
     _msgpack_unpacker_destroy(uk);
-    free(uk);
+    xfree(uk);
 }
 
 static void Unpacker_mark(msgpack_unpacker_t* uk)

data/lib/msgpack/version.rb

@@ -1,3 +1,3 @@
 module MessagePack
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/spec/packer_spec.rb

@@ -223,4 +223,34 @@ describe MessagePack::Packer do
       expect(two[:packer]).to eq(:to_msgpack_ext)
     end
   end
+
+  describe "ext formats" do
+    [1, 2, 4, 8, 16].zip([0xd4, 0xd5, 0xd6, 0xd7, 0xd8]).each do |n,b|
+      it "msgpack fixext #{n} format" do
+        MessagePack::ExtensionValue.new(1, "a"*n).to_msgpack.should ==
+          [b, 1].pack('CC') + "a"*n
+      end
+    end
+
+    it "msgpack ext 8 format" do
+      MessagePack::ExtensionValue.new(1, "").to_msgpack.should ==
+        [0xc7, 0, 1].pack('CCC') + ""
+      MessagePack::ExtensionValue.new(-1, "a"*255).to_msgpack.should ==
+        [0xc7, 255, -1].pack('CCC') + "a"*255
+    end
+
+    it "msgpack ext 16 format" do
+      MessagePack::ExtensionValue.new(1, "a"*256).to_msgpack.should ==
+        [0xc8, 256, 1].pack('CnC') + "a"*256
+      MessagePack::ExtensionValue.new(-1, "a"*65535).to_msgpack.should ==
+        [0xc8, 65535, -1].pack('CnC') + "a"*65535
+    end
+
+    it "msgpack ext 32 format" do
+      MessagePack::ExtensionValue.new(1, "a"*65536).to_msgpack.should ==
+        [0xc9, 65536, 1].pack('CNC') + "a"*65536
+      MessagePack::ExtensionValue.new(-1, "a"*65538).to_msgpack.should ==
+        [0xc9, 65538, -1].pack('CNC') + "a"*65538
+    end
+  end
 end

data/spec/unpacker_spec.rb

@@ -260,6 +260,33 @@ describe MessagePack::Unpacker do
     MessagePack.unpack([0xc6, 0x00, 0x00, 0x00, 0x02].pack('C*') + 'aa').should == "aa"
   end
 
+  describe "ext formats" do
+    let(:unpacker) { MessagePack::Unpacker.new(allow_unknown_ext: true) }
+
+    [1, 2, 4, 8, 16].zip([0xd4, 0xd5, 0xd6, 0xd7, 0xd8]).each do |n,b|
+      it "msgpack fixext #{n} format" do
+        unpacker.feed([b, 1].pack('CC') + "a"*n).unpack.should == MessagePack::ExtensionValue.new(1, "a"*n)
+        unpacker.feed([b, -1].pack('CC') + "a"*n).unpack.should == MessagePack::ExtensionValue.new(-1, "a"*n)
+      end
+    end
+
+    it "msgpack ext 8 format" do
+      unpacker.feed([0xc7, 0, 1].pack('CCC')).unpack.should == MessagePack::ExtensionValue.new(1, "")
+      unpacker.feed([0xc7, 255, -1].pack('CCC') + "a"*255).unpack.should == MessagePack::ExtensionValue.new(-1, "a"*255)
+    end
+
+    it "msgpack ext 16 format" do
+      unpacker.feed([0xc8, 0, 1].pack('CnC')).unpack.should == MessagePack::ExtensionValue.new(1, "")
+      unpacker.feed([0xc8, 256, -1].pack('CnC') + "a"*256).unpack.should == MessagePack::ExtensionValue.new(-1, "a"*256)
+    end
+
+    it "msgpack ext 32 format" do
+      unpacker.feed([0xc9, 0, 1].pack('CNC')).unpack.should == MessagePack::ExtensionValue.new(1, "")
+      unpacker.feed([0xc9, 256, -1].pack('CNC') + "a"*256).unpack.should == MessagePack::ExtensionValue.new(-1, "a"*256)
+      unpacker.feed([0xc9, 65536, -1].pack('CNC') + "a"*65536).unpack.should == MessagePack::ExtensionValue.new(-1, "a"*65536)
+    end
+  end
+
   class ValueOne
     attr_reader :num
     def initialize(num)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgpack
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-24 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler