Merge branch '4.1' into 4.2

This commit is contained in:
Mario Zechner 2024-05-27 13:00:04 +02:00
commit 8880546b78

View File

@ -324,6 +324,12 @@ SkeletonData *SkeletonBinary::readSkeletonData(const unsigned char *binary, cons
skeletonData->_skins.add(defaultSkin); skeletonData->_skins.add(defaultSkin);
} }
if (!this->getError().isEmpty()) {
delete input;
delete skeletonData;
return NULL;
}
/* Skins. */ /* Skins. */
for (size_t i = 0, n = (size_t) readVarint(input, true); i < n; ++i) { for (size_t i = 0, n = (size_t) readVarint(input, true); i < n; ++i) {
Skin *skin = readSkin(input, false, skeletonData, nonessential); Skin *skin = readSkin(input, false, skeletonData, nonessential);