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

loader lottie: ++safety.

Browse source 
It shouldn't corrupt, even if it doesn't support certain features.
This commit is contained in:
Hermet Park 2023-07-29 01:53:59 +09:00 • committed by Hermet Park
parent 24c0b5ecf5
commit e0ed2c7ace
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/loaders/lottie/tvgLottieBuilder.cpp
View file

@ -363,6 +363,7 @@ bool LottieBuilder::update(LottieComposition* comp, int32_t frameNo)
//Update root layer //Update root layer
auto root = comp->root; auto root = comp->root;
if (!root) return false;
//Prepare render data //Prepare render data
if (!root->scene) { if (!root->scene) {

21
src/loaders/lottie/tvgLottieParser.cpp
View file

@ -527,8 +527,6 @@ LottieSolidFill* LottieParser::parseSolidFill()
void LottieParser::parseStrokeDash(LottieStroke* stroke) void LottieParser::parseStrokeDash(LottieStroke* stroke)
{ {
TVGLOG("LOTTIE", "StrokeDash(d) is not supported");
enterArray(); enterArray();
while (nextArrayValue()) { while (nextArrayValue()) {
enterObject(); enterObject();
@ -555,7 +553,12 @@ LottieSolidStroke* LottieParser::parseSolidStroke()
else if (!strcmp(key, "nm")) stroke->name = getStringCopy(); else if (!strcmp(key, "nm")) stroke->name = getStringCopy();
else if (!strcmp(key, "hd")) stroke->hidden = getBool(); else if (!strcmp(key, "hd")) stroke->hidden = getBool();
else if (!strcmp(key, "fillEnabled")) stroke->disabled = !getBool(); else if (!strcmp(key, "fillEnabled")) stroke->disabled = !getBool();
else if (!strcmp(key, "d")) parseStrokeDash(stroke); else if (!strcmp(key, "d"))
{
TVGLOG("LOTTIE", "StrokeDash(d) is not supported");
skip(key);
//parseStrokeDash(stroke);
}
else skip(key); else skip(key);
} }
stroke->prepare(); stroke->prepare();
@ -899,7 +902,11 @@ LottieLayer* LottieParser::parseLayer()
else if (!strcmp(key, "st")) layer->startFrame = lroundf(getFloat()); else if (!strcmp(key, "st")) layer->startFrame = lroundf(getFloat());
else if (!strcmp(key, "bm")) layer->blendMethod = getBlendMethod(); else if (!strcmp(key, "bm")) layer->blendMethod = getBlendMethod();
else if (!strcmp(key, "parent")) layer->pid = getInt(); else if (!strcmp(key, "parent")) layer->pid = getInt();
else if (!strcmp(key, "tm")) TVGLOG("LOTTIE", "Time Remap(tm) is not supported"); else if (!strcmp(key, "tm"))
{
TVGLOG("LOTTIE", "Time Remap(tm) is not supported");
skip(key);
}
else if (!strcmp(key, "w")) layer->w = getInt(); else if (!strcmp(key, "w")) layer->w = getInt();
else if (!strcmp(key, "h")) layer->h = getInt(); else if (!strcmp(key, "h")) layer->h = getInt();
else if (!strcmp(key, "sw")) layer->w = getInt(); else if (!strcmp(key, "sw")) layer->w = getInt();
@ -907,7 +914,11 @@ LottieLayer* LottieParser::parseLayer()
else if (!strcmp(key, "sc")) layer->color = getColor(getString()); else if (!strcmp(key, "sc")) layer->color = getColor(getString());
else if (!strcmp(key, "tt")) layer->matteType = getMatteType(); else if (!strcmp(key, "tt")) layer->matteType = getMatteType();
else if (!strcmp(key, "hasMask")) layer->mask = getBool(); else if (!strcmp(key, "hasMask")) layer->mask = getBool();
else if (!strcmp(key, "masksProperties")) TVGLOG("LOTTIE", "Masking(maskProperties) is not supported"); else if (!strcmp(key, "masksProperties"))
{
TVGLOG("LOTTIE", "Masking(maskProperties) is not supported");
skip(key);
}
else if (!strcmp(key, "hd")) layer->hidden = getBool(); else if (!strcmp(key, "hd")) layer->hidden = getBool();
else if (!strcmp(key, "refId")) layer->refId = getStringCopy(); else if (!strcmp(key, "refId")) layer->refId = getStringCopy();
else skip(key); else skip(key);