From 9bc0e85dcebe74cc72a6413c88d56c259c615a4d Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Tue, 29 Nov 2005 11:07:54 +0000 Subject: [PATCH] gst/gstregistryxml.c: Don't crash if we failed to load a feature from a plugin. Original commit message from CVS: * gst/gstregistryxml.c: (load_plugin): Don't crash if we failed to load a feature from a plugin. --- ChangeLog | 5 +++++ common | 2 +- gst/gstregistryxml.c | 3 +-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3960d6..8805454 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-11-29 Michael Smith + + * gst/gstregistryxml.c: (load_plugin): + Don't crash if we failed to load a feature from a plugin. + 2005-11-28 Thomas Vander Stichele * check/pipelines/simple_launch_lines.c: (setup_pipeline), diff --git a/common b/common index f31468e..33084fb 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit f31468e933b5b980398cf636a37abf16ca46c4a0 +Subproject commit 33084fbe0531733bc02aa1d9de608206d5553a15 diff --git a/gst/gstregistryxml.c b/gst/gstregistryxml.c index 31f50fd..65c6acd 100644 --- a/gst/gstregistryxml.c +++ b/gst/gstregistryxml.c @@ -699,9 +699,8 @@ load_plugin (xmlTextReaderPtr reader, GList ** feature_list) } else if (g_str_equal (tag, "feature")) { GstPluginFeature *feature = load_feature (reader); - feature->plugin_name = g_strdup (plugin->desc.name); - if (feature) { + feature->plugin_name = g_strdup (plugin->desc.name); *feature_list = g_list_prepend (*feature_list, feature); } } else { -- 2.7.4