git_clone/thorvg
1
0
Fork 0
mirror of https://github.com/thorvg/thorvg.git synced 2025-06-15 12:34:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

lottie/expressions: hotfix a crash

Browse source 
Stabilized $bm_sum(), by allowing the different dimensional
arguments.

issue: https://github.com/thorvg/thorvg/issues/2664
This commit is contained in:
Hermet Park 2024-08-29 19:08:32 +09:00
parent 244e61205c
commit 354533c922
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/loaders/lottie/tvgLottieExpressions.cpp
View file

@ -334,21 +334,39 @@ static void _buildLayer(jerry_value_t context, float frameNo, LottieLayer* layer
static jerry_value_t _addsub(const jerry_value_t args[], float addsub) static jerry_value_t _addsub(const jerry_value_t args[], float addsub)
{ {
//1d auto n1 = jerry_value_is_number(args[0]);
if (jerry_value_is_number(args[0])) return jerry_number(jerry_value_as_number(args[0]) + addsub * jerry_value_as_number(args[1])); auto n2 = jerry_value_is_number(args[1]);
//2d //1d + 1d
auto val1 = jerry_object_get_index(args[0], 0); if (n1 && n2) return jerry_number(jerry_value_as_number(args[0]) + addsub * jerry_value_as_number(args[1]));
auto val2 = jerry_object_get_index(args[0], 1);
auto val3 = jerry_object_get_index(args[1], 0);
auto val4 = jerry_object_get_index(args[1], 1);
auto x = jerry_value_as_number(val1) + addsub * jerry_value_as_number(val3);
auto y = jerry_value_as_number(val2) + addsub * jerry_value_as_number(val4);
auto val1 = jerry_object_get_index(args[n1 ? 1 : 0], 0);
auto val2 = jerry_object_get_index(args[n1 ? 1 : 0], 1);
auto x = jerry_value_as_number(val1);
auto y = jerry_value_as_number(val2);
jerry_value_free(val1); jerry_value_free(val1);
jerry_value_free(val2); jerry_value_free(val2);
jerry_value_free(val3);
jerry_value_free(val4); //2d + 1d
if (n1 || n2) {
auto secondary = n1 ? 0 : 1;
auto val3 = jerry_value_as_number(args[secondary]);
if (secondary == 0) {
x = (x * addsub) + val3;
y = (y * addsub) + val3;
} else {
x += (addsub * val3);
y += (addsub * val3);
}
//2d + 2d
} else {
auto val3 = jerry_object_get_index(args[1], 0);
auto val4 = jerry_object_get_index(args[1], 1);
x += (addsub * jerry_value_as_number(val3));
y += (addsub * jerry_value_as_number(val4));
jerry_value_free(val3);
jerry_value_free(val4);
}
auto obj = jerry_object(); auto obj = jerry_object();
val1 = jerry_number(x); val1 = jerry_number(x);