Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6687 from dumganhar/value-fix 

Null ptr check in value assignment
This commit is contained in:
minggo 2014-05-12 18:59:07 +08:00
parent 528848765a b24f742c92
commit b8be364ae2
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cocos/base/CCValue.cpp
View File

@ -33,7 +33,7 @@ const Value Value::Null;
Value::Value()
: _type(Type::NONE)
{
memset(&_field, 0, sizeof(_field));
}
Value::Value(unsigned char v)
@ -162,15 +162,31 @@ Value& Value::operator= (const Value& other)
_field.boolVal = other._field.boolVal;
break;
case Type::STRING:
if (_field.strVal == nullptr)
{
_field.strVal = new std::string();
}
*_field.strVal = *other._field.strVal;
break;
case Type::VECTOR:
if (_field.vectorVal == nullptr)
{
_field.vectorVal = new ValueVector();
}
*_field.vectorVal = *other._field.vectorVal;
break;
case Type::MAP:
if (_field.mapVal == nullptr)
{
_field.mapVal = new ValueMap();
}
*_field.mapVal = *other._field.mapVal;
break;
case Type::INT_KEY_MAP:
if (_field.intKeyMapVal == nullptr)
{
_field.intKeyMapVal = new ValueMapIntKey();
}
*_field.intKeyMapVal = *other._field.intKeyMapVal;
break;
default: