mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests: fix NULL pointer dereference, ternary operator silliness and message type use

Browse source
This commit is contained in:
Tim-Philipp Müller 2013-08-24 18:21:26 +01:00
parent e2385bcb2f
commit 4318f683d9
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/check/ges/test-utils.c
View file

@ -153,19 +153,19 @@ ges_generate_test_file_audio_video (const gchar * filedest,
while (!done) { while (!done) {
message = gst_bus_poll (bus, GST_MESSAGE_ANY, GST_CLOCK_TIME_NONE); message = gst_bus_poll (bus, GST_MESSAGE_ANY, GST_CLOCK_TIME_NONE);
if (GST_MESSAGE_TYPE (message) & GST_MESSAGE_EOS) { if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_EOS) {
done = TRUE; done = TRUE;
ret = TRUE; ret = TRUE;
} else if (GST_MESSAGE_TYPE (message) & GST_MESSAGE_ERROR) { } else if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_ERROR) {
gchar *debug = NULL; gchar *debug = NULL;
GError *err = NULL; GError *err = NULL;
gst_message_parse_error (message, NULL, &debug); gst_message_parse_error (message, &err, &debug);
done = TRUE; done = TRUE;
ret = FALSE; ret = FALSE;
GST_ERROR ("Got error %s from %s fron the bus while generation: %s" GST_ERROR ("Got error %s from %s fron the bus while generation: %s"
"debug infos: %s", GST_OBJECT_NAME (message->src), err->message, "debug infos: %s", GST_OBJECT_NAME (message->src), err->message,
debug ? debug : NULL, filedest); debug ? debug : "none", filedest);
g_clear_error (&err); g_clear_error (&err);
g_free (debug); g_free (debug);
} }