generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-05-19 03:47:35 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #192 from marklakata/size_t

Browse Source 
changed length argument of duplicateStringValue from unsigned int to siz...
This commit is contained in:
Christopher Dunn 2015-03-02 17:03:24 -06:00
commit b947b0b3df
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib_json/json_value.cpp
View File

@ -52,7 +52,7 @@ const LargestInt Value::maxLargestInt = LargestInt(LargestUInt(-1) / 2);
const LargestUInt Value::maxLargestUInt = LargestUInt(-1); const LargestUInt Value::maxLargestUInt = LargestUInt(-1);
/// Unknown size marker /// Unknown size marker
static const unsigned int unknown = (unsigned)-1; static const size_t unknown = (size_t)-1;
#if !defined(JSON_USE_INT64_DOUBLE_CONVERSION) #if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
template <typename T, typename U> template <typename T, typename U>
@ -82,13 +82,13 @@ static inline bool InRange(double d, T min, U max) {
* @return Pointer on the duplicate instance of string. * @return Pointer on the duplicate instance of string.
*/ */
static inline char* duplicateStringValue(const char* value, static inline char* duplicateStringValue(const char* value,
unsigned int length = unknown) { size_t length = unknown) {
if (length == unknown) if (length == unknown)
length = (unsigned int)strlen(value); length = strlen(value);
// Avoid an integer overflow in the call to malloc below by limiting length // Avoid an integer overflow in the call to malloc below by limiting length
// to a sane value. // to a sane value.
if (length >= (unsigned)Value::maxInt) if (length >= (size_t)Value::maxInt)
length = Value::maxInt - 1; length = Value::maxInt - 1;
char* newString = static_cast<char*>(malloc(length + 1)); char* newString = static_cast<char*>(malloc(length + 1));