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

lottie: fix potential memory leaks.

Browse source 
memory could be leaked during the slot property overriding.
This commit is contained in:
Hermet Park 2024-03-06 22:05:51 +09:00
parent d816d8fb5b
commit d50eea2a2c
1 changed files with 48 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/loaders/lottie/tvgLottieProperty.h
View file

@ -253,9 +253,10 @@ struct LottieGenericProperty : LottieProperty
{
//shallow copy, used for slot overriding
delete(frames);
if (other.frames) frames = other.frames;
else value = other.value;
const_cast<T&>(other).frames = nullptr;
if (other.frames) {
frames = other.frames;
const_cast<T&>(other).frames = nullptr;
} else value = other.value;
return *this;
}
@ -363,13 +364,24 @@ struct LottieColorStop : LottieProperty
~LottieColorStop()
{
free(value.data);
release();
}
void release()
{
if (value.data) {
free(value.data);
value.data = nullptr;
}
if (!frames) return;
for (auto p = frames->begin(); p < frames->end(); ++p) {
free((*p).value.data);
}
free(frames->data);
free(frames);
frames = nullptr;
}
LottieScalarFrame<ColorStop>& newFrame()
@ -442,11 +454,15 @@ struct LottieColorStop : LottieProperty
LottieColorStop& operator=(const LottieColorStop& other)
{
//shallow copy, used for slot overriding
delete(frames);
if (other.frames) frames = other.frames;
else value = other.value;
release();
if (other.frames) {
frames = other.frames;
const_cast<LottieColorStop&>(other).frames = nullptr;
} else {
value = other.value;
const_cast<LottieColorStop&>(other).value.data = nullptr;
}
count = other.count;
const_cast<LottieColorStop&>(other).frames = nullptr;
return *this;
}
@ -523,15 +539,28 @@ struct LottieTextDoc : LottieProperty
~LottieTextDoc()
{
free(value.text);
free(value.name);
release();
}
void release()
{
if (value.text) {
free(value.text);
value.text = nullptr;
}
if (value.name) {
free(value.name);
value.name = nullptr;
}
if (!frames) return;
for (auto p = frames->begin(); p < frames->end(); ++p) {
free((*p).value.text);
free((*p).value.name);
}
delete(frames);
frames = nullptr;
}
LottieScalarFrame<TextDocument>& newFrame()
@ -564,10 +593,15 @@ struct LottieTextDoc : LottieProperty
LottieTextDoc& operator=(const LottieTextDoc& other)
{
//shallow copy, used for slot overriding
delete(frames);
if (other.frames) frames = other.frames;
else value = other.value;
const_cast<LottieTextDoc&>(other).frames = nullptr;
release();
if (other.frames) {
frames = other.frames;
const_cast<LottieTextDoc&>(other).frames = nullptr;
} else {
value = other.value;
const_cast<LottieTextDoc&>(other).value.text = nullptr;
const_cast<LottieTextDoc&>(other).value.name = nullptr;
}
return *this;
}