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

lottie/slot: Fixed potential overriding bug

Browse source 
Slot overriding tries to set property via the `LottieObject`. It potentially causes unexpected changes.

Revised the `override` function. The purpose of this patch is to aim atomic property to be overriden.
This commit is contained in:
Jinny You 2024-03-21 16:18:24 +09:00 • committed by Hermet Park
parent 98b30c72ef
commit 9d040f9042
1 changed files with 30 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/loaders/lottie/tvgLottieModel.h
View file

@ -125,7 +125,7 @@ struct LottieObject
free(name); free(name);
} }
virtual void override(LottieObject* prop) virtual void override(LottieProperty* prop)
{ {
TVGERR("LOTTIE", "Unsupported slot type"); TVGERR("LOTTIE", "Unsupported slot type");
} }
@ -188,9 +188,9 @@ struct LottieText : LottieObject
LottieObject::type = LottieObject::Text; LottieObject::type = LottieObject::Text;
} }
void override(LottieObject* prop) override void override(LottieProperty* prop) override
{ {
this->doc = static_cast<LottieText*>(prop)->doc; this->doc = *static_cast<LottieTextDoc*>(prop);
this->prepare(); this->prepare();
} }
@ -351,9 +351,9 @@ struct LottieSolidStroke : LottieSolid, LottieStroke
if (color.frames || opacity.frames || LottieStroke::dynamic()) statical = false; if (color.frames || opacity.frames || LottieStroke::dynamic()) statical = false;
} }
void override(LottieObject* prop) override void override(LottieProperty* prop) override
{ {
this->color = static_cast<LottieSolid*>(prop)->color; this->color = *static_cast<LottieColor*>(prop);
this->prepare(); this->prepare();
} }
}; };
@ -367,9 +367,9 @@ struct LottieSolidFill : LottieSolid
if (color.frames || opacity.frames) statical = false; if (color.frames || opacity.frames) statical = false;
} }
void override(LottieObject* prop) override void override(LottieProperty* prop) override
{ {
this->color = static_cast<LottieSolid*>(prop)->color; this->color = *static_cast<LottieColor*>(prop);
this->prepare(); this->prepare();
} }
@ -494,9 +494,9 @@ struct LottieGradientFill : LottieGradient
if (LottieGradient::prepare()) statical = false; if (LottieGradient::prepare()) statical = false;
} }
void override(LottieObject* prop) override void override(LottieProperty* prop) override
{ {
this->colorStops = static_cast<LottieGradient*>(prop)->colorStops; this->colorStops = *static_cast<LottieColorStop*>(prop);
this->prepare(); this->prepare();
} }
@ -512,9 +512,9 @@ struct LottieGradientStroke : LottieGradient, LottieStroke
if (LottieGradient::prepare() || LottieStroke::dynamic()) statical = false; if (LottieGradient::prepare() || LottieStroke::dynamic()) statical = false;
} }
void override(LottieObject* prop) override void override(LottieProperty* prop) override
{ {
this->colorStops = static_cast<LottieGradient*>(prop)->colorStops; this->colorStops = *static_cast<LottieColorStop*>(prop);
this->prepare(); this->prepare();
} }
}; };
@ -642,28 +642,36 @@ struct LottieSlot
//apply slot object to all targets //apply slot object to all targets
for (auto pair = pairs.begin(); pair < pairs.end(); ++pair) { for (auto pair = pairs.begin(); pair < pairs.end(); ++pair) {
//backup the original properties before overwriting //backup the original properties before overwriting
if (!overriden) { switch (type) {
switch (type) { case LottieProperty::Type::ColorStop: {
case LottieProperty::Type::ColorStop: { if (!overriden) {
pair->prop = new LottieColorStop; pair->prop = new LottieColorStop;
*static_cast<LottieColorStop*>(pair->prop) = static_cast<LottieGradient*>(pair->obj)->colorStops; *static_cast<LottieColorStop*>(pair->prop) = static_cast<LottieGradient*>(pair->obj)->colorStops;
break;
} }
case LottieProperty::Type::Color: {
pair->obj->override(&static_cast<LottieGradient*>(target)->colorStops);
break;
}
case LottieProperty::Type::Color: {
if (!overriden) {
pair->prop = new LottieColor; pair->prop = new LottieColor;
*static_cast<LottieColor*>(pair->prop) = static_cast<LottieSolid*>(pair->obj)->color; *static_cast<LottieColor*>(pair->prop) = static_cast<LottieSolid*>(pair->obj)->color;
break;
} }
case LottieProperty::Type::TextDoc: {
pair->obj->override(&static_cast<LottieSolid*>(target)->color);
break;
}
case LottieProperty::Type::TextDoc: {
if (!overriden) {
pair->prop = new LottieTextDoc; pair->prop = new LottieTextDoc;
*static_cast<LottieTextDoc*>(pair->prop) = static_cast<LottieText*>(pair->obj)->doc; *static_cast<LottieTextDoc*>(pair->prop) = static_cast<LottieText*>(pair->obj)->doc;
break;
} }
default: break;
pair->obj->override(&static_cast<LottieText*>(target)->doc);
break;
} }
default: break;
} }
//FIXME: it overrides the object's whole properties, but it acutally needs a single property of it.
pair->obj->override(target);
} }
overriden = true; overriden = true;
} }