From 1911513acbe5ac7cddc7d6173adb7bd66f98f361 Mon Sep 17 00:00:00 2001
From: Takatoshi Kondo <redboltz@gmail.com>
Date: Thu, 26 Mar 2015 11:35:47 +0900
Subject: [PATCH] Added a container size checking to vector<bool>. All other
 containers have already been added it.

---
 include/msgpack/adaptor/vector_bool.hpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/msgpack/adaptor/vector_bool.hpp b/include/msgpack/adaptor/vector_bool.hpp
index 93cbd736..7893a1a3 100644
--- a/include/msgpack/adaptor/vector_bool.hpp
+++ b/include/msgpack/adaptor/vector_bool.hpp
@@ -45,7 +45,8 @@ inline msgpack::object const& operator>> (msgpack::object const& o, std::vector<
 template <typename Stream>
 inline msgpack::packer<Stream>& operator<< (msgpack::packer<Stream>& o, const std::vector<bool>& v)
 {
-    o.pack_array(v.size());
+    uint32_t size = checked_get_container_size(v.size());
+    o.pack_array(size);
     for(std::vector<bool>::const_iterator it(v.begin()), it_end(v.end());
         it != it_end; ++it) {
         o.pack(static_cast<bool>(*it));
@@ -60,10 +61,11 @@ inline void operator<< (msgpack::object::with_zone& o, const std::vector<bool>&
         o.via.array.ptr = nullptr;
         o.via.array.size = 0;
     } else {
-        msgpack::object* p = static_cast<msgpack::object*>(o.zone.allocate_align(sizeof(msgpack::object)*v.size()));
-        msgpack::object* const pend = p + v.size();
+        uint32_t size = checked_get_container_size(v.size());
+        msgpack::object* p = static_cast<msgpack::object*>(o.zone.allocate_align(sizeof(msgpack::object)*size));
+        msgpack::object* const pend = p + size;
         o.via.array.ptr = p;
-        o.via.array.size = v.size();
+        o.via.array.size = size;
         std::vector<bool>::const_iterator it(v.begin());
         do {
             *p = object(static_cast<bool>(*it), o.zone);