From d6122b4a18cbc9829cc1dbebf72890fcab311ff8 Mon Sep 17 00:00:00 2001
From: Thiago de Arruda <tpadilha84@gmail.com>
Date: Mon, 15 Sep 2014 15:26:42 -0300
Subject: [PATCH] Fix size packing/unpacking for EXT 8/16/32

For EXT 8/16/32, the "size" field was being incremented by 1 to account for the
type field, but according to the specification the size should only consider the
length of the data field.
---
 include/msgpack/pack_template.h   | 1 -
 include/msgpack/unpack_template.h | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/msgpack/pack_template.h b/include/msgpack/pack_template.h
index 9426a2170..fc47619fa 100644
--- a/include/msgpack/pack_template.h
+++ b/include/msgpack/pack_template.h
@@ -841,7 +841,6 @@ msgpack_pack_inline_func(_ext)(msgpack_pack_user x, size_t l, int8_t type)
         msgpack_pack_append_buffer(x, buf, 2);
     } break;
     default:
-        l += 1;
         if(l < 256) {
             char buf[3];
             buf[0] = 0xc7;
diff --git a/include/msgpack/unpack_template.h b/include/msgpack/unpack_template.h
index 7e50692f4..28ceb9e4e 100644
--- a/include/msgpack/unpack_template.h
+++ b/include/msgpack/unpack_template.h
@@ -324,7 +324,7 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c
             case CS_BIN_8:
                 again_fixed_trail_if_zero(ACS_BIN_VALUE, *(uint8_t*)n, _bin_zero);
             case CS_EXT_8:
-                again_fixed_trail_if_zero(ACS_EXT_VALUE, *(uint8_t*)n, _ext_zero);
+                again_fixed_trail_if_zero(ACS_EXT_VALUE, (*(uint8_t*)n) + 1, _ext_zero);
             case CS_STR_16:{
                 uint16_t tmp;
                 _msgpack_load16(uint16_t,n,&tmp);
@@ -338,7 +338,7 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c
             case CS_EXT_16:{
                 uint16_t tmp;
                 _msgpack_load16(uint16_t,n,&tmp);
-                again_fixed_trail_if_zero(ACS_EXT_VALUE, tmp, _ext_zero);
+                again_fixed_trail_if_zero(ACS_EXT_VALUE, tmp + 1, _ext_zero);
             }
             case CS_STR_32:{
                 uint32_t tmp;
@@ -353,7 +353,7 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c
             case CS_EXT_32:{
                 uint32_t tmp;
                 _msgpack_load32(uint32_t,n,&tmp);
-                again_fixed_trail_if_zero(ACS_EXT_VALUE, tmp, _ext_zero);
+                again_fixed_trail_if_zero(ACS_EXT_VALUE, tmp + 1, _ext_zero);
             }
             case ACS_STR_VALUE:
             _str_zero: