mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

tracerrecord: Remove useless NULL check and add assertion for making assumptions explicit

Browse source 
gst_structure_new_empty() is not returning NULL in any valid scenarios,
checking for NULL here is useless. Especially because we would dereference any
NULL right after the NULL check again.
CID 1352037.

We previously check if the string ends on .class, as such strrchr() should
return something non-NULL. Add an assertion for that.
CID 1349642.
This commit is contained in:
Sebastian Dröge 2016-03-02 10:37:09 +02:00
parent c7734d2711
commit c904e00661
1 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
gst/gsttracerrecord.c
View file

@ -112,6 +112,7 @@ gst_tracer_record_build_format (GstTracerRecord * self)
/* cut off '.class' suffix */ /* cut off '.class' suffix */
name = g_strdup (name); name = g_strdup (name);
p = strrchr (name, '.'); p = strrchr (name, '.');
g_assert (p != NULL);
*p = '\0'; *p = '\0';
s = g_string_sized_new (STRUCTURE_ESTIMATED_STRING_LEN (structure)); s = g_string_sized_new (STRUCTURE_ESTIMATED_STRING_LEN (structure));
@ -186,37 +187,35 @@ gst_tracer_record_new (const gchar * name, const gchar * firstfield, ...)
GstTracerRecord *self; GstTracerRecord *self;
GstStructure *structure; GstStructure *structure;
va_list varargs; va_list varargs;
gchar *err = NULL;
GType type;
GQuark id;
va_start (varargs, firstfield); va_start (varargs, firstfield);
structure = gst_structure_new_empty (name); structure = gst_structure_new_empty (name);
if (structure) {
gchar *err = NULL;
GType type;
GQuark id;
while (firstfield) { while (firstfield) {
GValue val = { 0, }; GValue val = { 0, };
id = g_quark_from_string (firstfield); id = g_quark_from_string (firstfield);
type = va_arg (varargs, GType); type = va_arg (varargs, GType);
/* all fields passed here must be GstStructures which we take over */ /* all fields passed here must be GstStructures which we take over */
if (type != GST_TYPE_STRUCTURE) { if (type != GST_TYPE_STRUCTURE) {
GST_WARNING ("expected field of type GstStructure, but %s is %s", GST_WARNING ("expected field of type GstStructure, but %s is %s",
firstfield, g_type_name (type)); firstfield, g_type_name (type));
}
G_VALUE_COLLECT_INIT (&val, type, varargs, G_VALUE_NOCOPY_CONTENTS, &err);
if (G_UNLIKELY (err)) {
g_critical ("%s", err);
break;
}
/* see boxed_proxy_collect_value */
val.data[1].v_uint &= ~G_VALUE_NOCOPY_CONTENTS;
gst_structure_id_take_value (structure, id, &val);
firstfield = va_arg (varargs, gchar *);
} }
G_VALUE_COLLECT_INIT (&val, type, varargs, G_VALUE_NOCOPY_CONTENTS, &err);
if (G_UNLIKELY (err)) {
g_critical ("%s", err);
break;
}
/* see boxed_proxy_collect_value */
val.data[1].v_uint &= ~G_VALUE_NOCOPY_CONTENTS;
gst_structure_id_take_value (structure, id, &val);
firstfield = va_arg (varargs, gchar *);
} }
va_end (varargs); va_end (varargs);