From: Wim Taymans Date: Wed, 5 Mar 2014 14:44:25 +0000 (+0100) Subject: rtspsrc: handle NULL control urls better X-Git-Tag: 1.3.1~175 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=99a9d2873cd09d0caf92078410e4f65cc246bd90;p=platform%2Fupstream%2Fgst-plugins-good.git rtspsrc: handle NULL control urls better --- diff --git a/gst/rtsp/gstrtspsrc.c b/gst/rtsp/gstrtspsrc.c index 8eb39e8..5127785 100644 --- a/gst/rtsp/gstrtspsrc.c +++ b/gst/rtsp/gstrtspsrc.c @@ -1170,16 +1170,20 @@ find_stream_by_udpsrc (GstRTSPStream * stream, gconstpointer a) static gint find_stream_by_setup (GstRTSPStream * stream, gconstpointer a) { - /* check qualified setup_url */ - if (!strcmp (stream->conninfo.location, (gchar *) a)) - return 0; - /* check original control_url */ - if (!strcmp (stream->control_url, (gchar *) a)) - return 0; + if (stream->conninfo.location) { + /* check qualified setup_url */ + if (!strcmp (stream->conninfo.location, (gchar *) a)) + return 0; + } + if (stream->control_url) { + /* check original control_url */ + if (!strcmp (stream->control_url, (gchar *) a)) + return 0; - /* check if qualified setup_url ends with string */ - if (g_str_has_suffix (stream->control_url, (gchar *) a)) - return 0; + /* check if qualified setup_url ends with string */ + if (g_str_has_suffix (stream->control_url, (gchar *) a)) + return 0; + } return -1; }