openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Protect child_clip_id from accessing NULL parentClip property

Browse Source
This commit is contained in:
Jonathan Thomas
2023-04-13 15:03:25 -05:00
parent c472a2488d
commit def438dd0a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/TrackedObjectBBox.cpp
View File

@@ -383,9 +383,11 @@ void TrackedObjectBBox::SetJsonValue(const Json::Value root)
// Set the id of the child clip
if (!root["child_clip_id"].isNull() && root["child_clip_id"].asString() != "" && root["child_clip_id"].asString() != Id()){
Clip* parentClip = (Clip *) ParentClip();
if (root["child_clip_id"].asString() != parentClip->Id())
ChildClipId(root["child_clip_id"].asString());
if (parentClip && root["child_clip_id"].asString() != parentClip->Id()) {
ChildClipId(root["child_clip_id"].asString());
} else if (parentClip == NULL) {
ChildClipId(root["child_clip_id"].asString());
}
}
// Set the Keyframes by the given JSON object