Merge branch '3.8' into 3.9-beta

This commit is contained in:
badlogic 2019-10-30 15:49:14 +01:00
commit 9b63c65522

View File

@ -120,7 +120,15 @@ Json::Json(const char *value) :
}
Json::~Json() {
delete _child;
spine::Json* curr = nullptr;
spine::Json* next = _child;
do {
curr = next;
if (curr) {
next = curr->_next;
}
delete curr;
} while(next);
if (_valueString) {
SpineExtension::free(_valueString, __FILE__, __LINE__);
@ -129,8 +137,6 @@ Json::~Json() {
if (_name) {
SpineExtension::free(_name, __FILE__, __LINE__);
}
delete _next;
}
const char *Json::skip(const char *inValue) {