From 6e59ecdf7b25062d5094fd7130590ea3b7312925 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Tue, 11 Oct 2005 16:21:05 +0000 Subject: [PATCH] more str null protection Original commit message from CVS: more str null protection --- ChangeLog | 5 +++++ tools/gst-launch.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90970bdb7b..2b47fa74a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-10-11 Thomas Vander Stichele + + * tools/gst-launch.c: (main): + more null protecting + 2005-10-11 Thomas Vander Stichele * gst/gst-i18n-lib.h: diff --git a/tools/gst-launch.c b/tools/gst-launch.c index d89db7254c..880696adfb 100644 --- a/tools/gst-launch.c +++ b/tools/gst-launch.c @@ -530,7 +530,7 @@ main (int argc, char *argv[]) g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE); g_option_context_add_group (ctx, gst_init_get_option_group ()); if (!g_option_context_parse (ctx, &argc, &argv, &err)) { - g_print ("Error initializing: %s\n", err->message); + g_print ("Error initializing: %s\n", GST_STR_NULL (err->message)); exit (1); } @@ -585,14 +585,15 @@ main (int argc, char *argv[]) if (!pipeline) { if (error) { fprintf (stderr, _("ERROR: pipeline could not be constructed: %s.\n"), - error->message); + GST_STR_NULL (error->message)); g_error_free (error); } else { fprintf (stderr, _("ERROR: pipeline could not be constructed.\n")); } return 1; } else if (error) { - fprintf (stderr, _("WARNING: erroneous pipeline: %s\n"), error->message); + fprintf (stderr, _("WARNING: erroneous pipeline: %s\n"), + GST_STR_NULL (error->message)); g_error_free (error); return 1; }