729 Commits

Author SHA1 Message Date
Mario Zechner
501ad3553d [c][cpp] Fix for #2412 2023-11-28 13:30:02 +01:00
Mario Zechner
aeef4495de Merge branch '4.1' into 4.2-beta
# Conflicts:
#	spine-sfml/cpp/example/testbed.cpp
2023-10-24 17:12:22 +02:00
Mario Zechner
5989c861ca [c] Closes #2397, buffer overflow when loading sequences with less than 10 frames. 2023-10-19 19:43:59 +02:00
Mario Zechner
6241ce9f14 Merge branch '4.1' into 4.2-beta 2023-10-11 11:45:00 +02:00
Mario Zechner
087b2688db [c] Closes #2394, double free of sequences in mesh attachments. 2023-10-11 11:44:36 +02:00
Mario Zechner
90db1108db Merge branch '4.1' into 4.2-beta 2023-09-06 11:47:17 +02:00
Mario Zechner
aa0b9d57ca Formatting 2023-09-06 11:47:07 +02:00
Mario Zechner
8c53a07c5d Merge branch '4.1' into 4.2-beta 2023-09-06 11:07:25 +02:00
Mario Zechner
fed76c80c6 [c] Additional #2325 work, precalculate the space needed for property IDs in animations 2023-09-06 11:07:17 +02:00
Mario Zechner
8fb5d4f2b8 Merge branch '4.1' into 4.2-beta 2023-09-06 11:03:46 +02:00
Mario Zechner
066a152756 [c] Closes #2325, avoid allocations when reading vertices from binary files. 2023-09-06 11:03:35 +02:00
Mario Zechner
74b7882efa Merge branch '4.1' into 4.2-beta 2023-07-31 13:29:29 +02:00
Mario Zechner
4047f1ba07 Updated license headers. 2023-07-31 13:29:16 +02:00
Harald Csaszar
08b56ea1ca Merge branch '4.1' into 4.2-beta 2023-05-02 17:21:44 +02:00
Mario Zechner
18eef55eb5 [cpp] Formatting. 2023-05-02 13:06:10 +02:00
Mario Zechner
fc1cc6f0ee [c] Fix readVarint, closes #2281 2023-05-02 11:44:49 +02:00
Mario Zechner
0d443644c5 Merge branch '4.1' into 4.2-beta 2023-04-24 10:11:24 +02:00
Mario Zechner
cf68a9fd07 Formatting. 2023-04-24 10:11:14 +02:00
Alexey Gulev
4ca219668e
fix crash (#2270) 2023-04-24 09:39:55 +02:00
Dmitriy Sechin
77e2e34e8f
Handle skeleton loading problems without crashes (#2276)
This pull request improve the loading of binary skeleton so that there is no crash in case of attachment problems. 
Essentially, it will have the same behavior as for JSON skeleton, just returning NULL, and you can print pSkeleton->error to the output for the debug purpose.

The functions spSkeletonBinary_create() and spSkeletonJson_create() both use spAtlasAttachmentLoader, which creates attachments in its _spAtlasAttachmentLoader_createAttachment(). 
This function can return NULL in case of any problems with the atlas regions also setting internal error1,error2 to "Region not found: ", region_path

In case of SkeletonJson.c, there is a check for attachment != NULL after calling spAttachmentLoader_createAttachment(). 
However, unfortunately, there is no such check for SkeletonBinary.c, and if the region is not found, there is simply a crash deep inside the spine lib.

I fixed it like this

Currently, all calls to spAttachmentLoader_createAttachment() in SkeletonBinary.c are located inside the spSkeletonBinary_readAttachment() function, which is convenient. It is possible to check for the validity of the attachment after each _createAttachment() call. We can use
	if (!attachment)
		return NULL;

In fact, the problem with the attachment can only be in three cases inside spSkeletonBinary_readAttachment()
case SP_ATTACHMENT_REGION:
case SP_ATTACHMENT_MESH:
case SP_ATTACHMENT_LINKED_MESH:

But for the sake of consistency, it may be worth checking the other four cases:
SP_ATTACHMENT_BOUNDING_BOX:
SP_ATTACHMENT_PATH:
SP_ATTACHMENT_POINT:
SP_ATTACHMENT_CLIPPING:
(I do attachment check here, but maybe we can just "trust" that the attachment is always valid in this cases).

Now that spSkeletonBinary_readAttachment() can return NULL instead of crashing, so go on and fix the next function - spSkeletonBinary_readSkin()
Here, we also check the attachment for validity in this code 'for (i = 0; i < slotCount; ++i)'. 
Unfortunately, we cannot use 'continue' inside the loop here, as it is done in SkeletonJson.c, as we cannot move 'input->cursor' to the beginning of the data for the next slot. Here, we can only exit using return NULL, which generally suits us

And finally, in the function spSkeletonBinary_readSkeletonData(), there are only two calls to spSkeletonBinary_readSkin() - one for the default skin and another inside the loop for other skins. 
Here, you can apply a check 'if(self->attachmentLoader->error1)', and in case of problems, clear the data by spSkeletonData_dispose() and exit with return NULL; similarly to how it is done below for errors "Skin not found: " and "Parent mesh not found: ".

Thus, there will be no crash inside spine lib in case of attachment problems. Instead, NULL will be returned when calling spSkeletonBinary_readSkeletonData(), which the game engine can recognize and output the error message from pSkeleton->error in the output. 
This will help understand why my wonderful spine animation is not loading.
2023-04-24 09:39:05 +02:00
Harald Csaszar
954ab69bce Merge branch '4.1' into 4.2-beta 2023-04-06 13:30:38 +02:00
Mario Zechner
da68e66e9c [c][cpp] Formatting. 2023-04-06 13:26:25 +02:00
Mario Zechner
1fb89b6e89 [c][cpp] Port of commit e04e7b5. Adjusted fix for IK constraint NaN when parent has zero scale. 2023-04-06 13:25:13 +02:00
Mario Zechner
2b5bedd543 [c][cpp] Fixed IK constraint NaN when a parent bone has zero scale. 2023-04-05 15:50:28 +02:00
Mario Zechner
6f63f76600 [c] Fixed IK constraint NaN when a parent bone has zero scale. 2023-04-05 15:30:10 +02:00
Mario Zechner
de52f2a9e3 [c] Formatting. 2023-04-05 15:06:03 +02:00
Mario Zechner
5f0cb66cad Merge branch '4.1' into 4.2-beta 2023-03-15 10:56:05 +01:00
Mario Zechner
7a5c6995ef [c] Closes #2264, initialize atlas page defaults properly. 2023-03-15 10:55:53 +01:00
Mario Zechner
f85928c03a [c] Closes #2263, fix dark alpha component in JSON parser. 2023-03-15 10:49:34 +01:00
Mario Zechner
4a66ced952 Merge branch '4.1' into 4.2-beta 2023-02-27 13:44:34 +01:00
Mario Zechner
15f9e39b14 Formatting. 2023-02-27 13:44:19 +01:00
Mario Zechner
b0b1fe011e [c] Closes #2258, check for empty skins in JSON parser 2023-02-27 13:43:22 +01:00
Mario Zechner
a5fc30cbf2 Merge branch '4.1' into 4.2-beta 2023-02-20 12:57:34 +01:00
Mario Zechner
de808262bb [c] Closes #2253, incorrect parsing of stepped curves in SkeletonJson. 2023-02-20 12:57:23 +01:00
Mario Zechner
1891d00025 Merge branch '4.1' into 4.2-beta 2023-01-16 14:00:14 +01:00
Mario Zechner
83945e17dc Apply formatter. 2023-01-16 14:00:01 +01:00
Mario Zechner
19b1ea703c [c] Closes #2224, incorrect position calculation in path constraint 2023-01-16 13:55:31 +01:00
Mario Zechner
84f5a31026 Merge branch '4.1' into 4.2-beta 2022-12-27 12:10:10 +01:00
Mario Zechner
59dbba3e31 [c] Closes #2216, assign alpha if not given. 2022-12-27 11:50:38 +01:00
Harald Csaszar
603c024791 Merge branch '4.1' into 4.2-beta 2022-11-30 18:41:39 +01:00
Luke Ingram
38ae6f886c [c][cpp][ts] Port of 4bad9ec25e3281361a6599509881397711722e58 2022-11-30 13:34:20 -04:00
Mario Zechner
a57f1b85b6 Formatting 2022-10-28 10:41:13 +02:00
Mario Zechner
42bce02619 Merge branch '4.1' into 4.2-beta 2022-10-28 10:40:54 +02:00
Mario Zechner
3493de7fe8 Formatting 2022-10-28 10:40:38 +02:00
Mario Zechner
95487552dc Merge branch '4.1' into 4.2-beta 2022-10-07 12:24:17 +02:00
Mario Zechner
88515ec1a9 [c][cpp] Check if slot attachment is NULL when applying sequence timeline. 2022-10-07 12:24:07 +02:00
Mario Zechner
ecd0aca61c [c] Add spTrackEntry_resetRotationDirections(), update CHANGELOG, fix warnings. 2022-10-06 16:59:00 +02:00
Mario Zechner
98c10437c5 [c] Port of commit 3ea4f66. AnimationState, fixed rotation mix when direction changes. See #2158. 2022-10-06 16:48:46 +02:00
Mario Zechner
6705ad675f Merge branch '4.1' into 4.2-beta 2022-09-26 14:04:16 +02:00
Mario Zechner
ec0ea45149 [c] Fix formatting. 2022-09-26 14:03:59 +02:00