generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-04-27 10:25:58 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #519 from open-source-parsers/fix-517

Browse Source 
Avoid null for stringValue
This commit is contained in:
Christopher Dunn 2016-08-21 16:30:28 -05:00 committed by GitHub
commit 7d8eddb98c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib_json/json_value.cpp
View File

@ -343,6 +343,7 @@ bool Value::CZString::isStaticString() const { return storage_.policy_ == noDupl
* This optimization is used in ValueInternalMap fast allocator. * This optimization is used in ValueInternalMap fast allocator.
*/ */
Value::Value(ValueType vtype) { Value::Value(ValueType vtype) {
static char const empty[] = "";
initBasic(vtype); initBasic(vtype);
switch (vtype) { switch (vtype) {
case nullValue: case nullValue:
@ -355,7 +356,8 @@ Value::Value(ValueType vtype) {
value_.real_ = 0.0; value_.real_ = 0.0;
break; break;
case stringValue: case stringValue:
value_.string_ = 0; // allocated_ == false, so this is safe.
value_.string_ = const_cast<char*>(static_cast<char const*>(empty));
break; break;
case arrayValue: case arrayValue:
case objectValue: case objectValue:

8
src/lib_json/json_writer.cpp
View File

@ -353,7 +353,7 @@ void FastWriter::writeValue(const Value& value) {
break; break;
case stringValue: case stringValue:
{ {
// Is NULL possible for value.string_? // Is NULL possible for value.string_? No.
char const* str; char const* str;
char const* end; char const* end;
bool ok = value.getString(&str, &end); bool ok = value.getString(&str, &end);
@ -423,7 +423,7 @@ void StyledWriter::writeValue(const Value& value) {
break; break;
case stringValue: case stringValue:
{ {
// Is NULL possible for value.string_? // Is NULL possible for value.string_? No.
char const* str; char const* str;
char const* end; char const* end;
bool ok = value.getString(&str, &end); bool ok = value.getString(&str, &end);
@ -640,7 +640,7 @@ void StyledStreamWriter::writeValue(const Value& value) {
break; break;
case stringValue: case stringValue:
{ {
// Is NULL possible for value.string_? // Is NULL possible for value.string_? No.
char const* str; char const* str;
char const* end; char const* end;
bool ok = value.getString(&str, &end); bool ok = value.getString(&str, &end);
@ -921,7 +921,7 @@ void BuiltStyledStreamWriter::writeValue(Value const& value) {
break; break;
case stringValue: case stringValue:
{ {
// Is NULL is possible for value.string_? // Is NULL is possible for value.string_? No.
char const* str; char const* str;
char const* end; char const* end;
bool ok = value.getString(&str, &end); bool ok = value.getString(&str, &end);