From d1444581f6bfe06e894b24d55e80f873e4927d35 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Thu, 9 Apr 2020 11:24:44 -0400 Subject: [PATCH] asset: Avoid dereferencing NULL pointer CID 1461286 --- ges/ges-project.c | 9 +++++---- ges/ges-timeline.c | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ges/ges-project.c b/ges/ges-project.c index 75b7a49413..634a38d23f 100644 --- a/ges/ges-project.c +++ b/ges/ges-project.c @@ -606,7 +606,7 @@ ges_project_class_init (GESProjectClass * klass) * @project: the #GESProject on which a problem happend when creted a #GESAsset * @timeline: The timeline that failed loading * @error: The #GError defining the error that occured - * + * * Since: 1.18 */ _signals[ERROR_LOADING] = @@ -738,10 +738,11 @@ new_asset_cb (GESAsset * source, GAsyncResult * res, GESProject * project) return; } - ges_asset_finish_proxy (asset); - ges_project_add_asset (project, asset); - if (asset) + if (asset) { + ges_asset_finish_proxy (asset); + ges_project_add_asset (project, asset); gst_object_unref (asset); + } } /** diff --git a/ges/ges-timeline.c b/ges/ges-timeline.c index c6d59fd25b..d8dd8e5a53 100644 --- a/ges/ges-timeline.c +++ b/ges/ges-timeline.c @@ -1244,7 +1244,6 @@ _trim_transition (GESTimeline * timeline, GESTimelineElement * element, return FALSE; } - gboolean timeline_trim_object (GESTimeline * timeline, GESTimelineElement * object, guint32 new_layer_priority, GList * layers, GESEdge edge, guint64 position)