mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

gstxml: fix (de)serialisation of properties of type GstStructure

Browse source 
souphttpsrc has a property of type GstStructure, which causes an
assertion when serialising it to xml. Fixes #585137.
This commit is contained in:
Tim-Philipp Müller 2009-06-16 08:43:53 +01:00
parent 8624aaa415
commit 470e561216
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/gstelement.c
View file

@ -89,6 +89,7 @@
#include "gstevent.h" #include "gstevent.h"
#include "gstutils.h" #include "gstutils.h"
#include "gstinfo.h" #include "gstinfo.h"
#include "gstvalue.h"
#include "gst-i18n-lib.h" #include "gst-i18n-lib.h"
/* Element signals and args */ /* Element signals and args */
@ -2958,7 +2959,13 @@ gst_element_save_thyself (GstObject * object, xmlNodePtr parent)
else if (G_IS_PARAM_SPEC_INT64 (spec)) else if (G_IS_PARAM_SPEC_INT64 (spec))
contents = g_strdup_printf ("%" G_GINT64_FORMAT, contents = g_strdup_printf ("%" G_GINT64_FORMAT,
g_value_get_int64 (&value)); g_value_get_int64 (&value));
else else if (GST_VALUE_HOLDS_STRUCTURE (&value)) {
if (g_value_get_boxed (&value) != NULL) {
contents = g_strdup_value_contents (&value);
} else {
contents = g_strdup ("NULL");
}
} else
contents = g_strdup_value_contents (&value); contents = g_strdup_value_contents (&value);
xmlNewChild (param, NULL, (xmlChar *) "value", (xmlChar *) contents); xmlNewChild (param, NULL, (xmlChar *) "value", (xmlChar *) contents);

13
gst/gstutils.c
View file

@ -140,16 +140,25 @@ gst_util_set_object_arg (GObject * object, const gchar * name,
value_type = G_PARAM_SPEC_VALUE_TYPE (pspec); value_type = G_PARAM_SPEC_VALUE_TYPE (pspec);
GST_DEBUG ("pspec->flags is %d, pspec->value_type is %d", GST_DEBUG ("pspec->flags is %d, pspec->value_type is %s",
pspec->flags, (gint) value_type); pspec->flags, g_type_name (value_type));
if (!(pspec->flags & G_PARAM_WRITABLE)) if (!(pspec->flags & G_PARAM_WRITABLE))
return; return;
g_value_init (&v, value_type); g_value_init (&v, value_type);
/* special case for element <-> xml (de)serialisation */
if (GST_VALUE_HOLDS_STRUCTURE (&v) && strcmp (value, "NULL") == 0) {
g_value_set_boxed (&v, NULL);
goto done;
}
if (!gst_value_deserialize (&v, value)) if (!gst_value_deserialize (&v, value))
return; return;
done:
g_object_set_property (object, pspec->name, &v); g_object_set_property (object, pspec->name, &v);
g_value_unset (&v); g_value_unset (&v);
} }