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

lottie: ++memory access stability

Browse source 
Internal matrix can be null.
This update prevents such cases by using a safer API.
This commit is contained in:
Hermet Park 2024-07-11 00:56:13 +09:00
parent b24e876a67
commit e1871f79f8
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1125,30 +1125,28 @@ static void _updateText(LottieLayer* layer, float frameNo)
if (start > end) std::swap(start, end);
if (idx < start || idx >= end) continue;
auto matrix = PP(shape.get())->transform();
auto matrix = shape->transform();
shape->opacity((*s)->style.opacity(frameNo));
auto color = (*s)->style.fillColor(frameNo);
shape->fill(color.rgb[0], color.rgb[1], color.rgb[2], (*s)->style.fillOpacity(frameNo));
mathRotate(matrix, (*s)->style.rotation(frameNo));
mathRotate(&matrix, (*s)->style.rotation(frameNo));
auto glyphScale = (*s)->style.scale(frameNo) * 0.01f;
mathScale(matrix, glyphScale.x, glyphScale.y);
mathScale(&matrix, glyphScale.x, glyphScale.y);
auto position = (*s)->style.position(frameNo);
mathTranslate(matrix, position.x, position.y);
mathTranslate(&matrix, position.x, position.y);
shape->transform(*matrix);
shape->transform(matrix);
if (doc.stroke.render) {
auto strokeColor = (*s)->style.strokeColor(frameNo);
shape->stroke((*s)->style.strokeWidth(frameNo) / scale);
shape->stroke(strokeColor.rgb[0], strokeColor.rgb[1], strokeColor.rgb[2], (*s)->style.strokeOpacity(frameNo));
}
cursor.x += (*s)->style.letterSpacing(frameNo);
}