From 4318f683d95adcf893e23e7426681bd7e11205d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 24 Aug 2013 18:21:26 +0100 Subject: [PATCH] tests: fix NULL pointer dereference, ternary operator silliness and message type use --- tests/check/ges/test-utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/check/ges/test-utils.c b/tests/check/ges/test-utils.c index 8d3741d93a..7424f54820 100644 --- a/tests/check/ges/test-utils.c +++ b/tests/check/ges/test-utils.c @@ -153,19 +153,19 @@ ges_generate_test_file_audio_video (const gchar * filedest, while (!done) { 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; ret = TRUE; - } else if (GST_MESSAGE_TYPE (message) & GST_MESSAGE_ERROR) { + } else if (GST_MESSAGE_TYPE (message) == GST_MESSAGE_ERROR) { gchar *debug = NULL; GError *err = NULL; - gst_message_parse_error (message, NULL, &debug); + gst_message_parse_error (message, &err, &debug); done = TRUE; ret = FALSE; GST_ERROR ("Got error %s from %s fron the bus while generation: %s" "debug infos: %s", GST_OBJECT_NAME (message->src), err->message, - debug ? debug : NULL, filedest); + debug ? debug : "none", filedest); g_clear_error (&err); g_free (debug); }