generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-21 23:56:55 +02:00
Code Issues Projects Releases Wiki Activity

Fixed #226.

Browse Source 
Suppressed warnings on MSVC++ 64bit environment.
Added container size limit check.
This commit is contained in:
Takatoshi Kondo
2015-03-04 16:41:35 +09:00
parent f6d0cd9a4b
commit 8ad9ce059b
22 changed files with 283 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/msgpack/adaptor/char_ptr.hpp
View File

@@ -1,7 +1,7 @@
//
// MessagePack for C++ static resolution routine
//
// Copyright (C) 2014 KONDO Takatoshi
// Copyright (C) 2014-2015 KONDO Takatoshi
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@
#include "msgpack/versioning.hpp"
#include "msgpack/object_fwd.hpp"
#include "msgpack/adaptor/check_container_size.hpp"
#include <cstring>
namespace msgpack {
@@ -29,7 +31,7 @@ MSGPACK_API_VERSION_NAMESPACE(v1) {
template <typename Stream>
inline packer<Stream>& operator<< (packer<Stream>& o, const char* v)
{
std::size_t size = std::strlen(v);
uint32_t size = checked_get_container_size(std::strlen(v));
o.pack_str(size);
o.pack_str_body(v, size);
return o;
@@ -37,20 +39,20 @@ inline packer<Stream>& operator<< (packer<Stream>& o, const char* v)
inline void operator<< (object::with_zone& o, const char* v)
{
std::size_t size = std::strlen(v);
uint32_t size = checked_get_container_size(std::strlen(v));
o.type = type::STR;
char* ptr = static_cast<char*>(o.zone.allocate_align(size));
o.via.str.ptr = ptr;
o.via.str.size = static_cast<uint32_t>(size);
o.via.str.size = size;
memcpy(ptr, v, size);
}
inline void operator<< (object& o, const char* v)
{
std::size_t size = std::strlen(v);
uint32_t size = checked_get_container_size(std::strlen(v));
o.type = type::STR;
o.via.str.ptr = v;
o.via.str.size = static_cast<uint32_t>(size);
o.via.str.size = size;
}
} // MSGPACK_API_VERSION_NAMESPACE(v1)