[gst-cvs] gst-plugins-base: rtspconnection: make sure not to dereference NULL username or password

[<tp...@ke...>]

Module: gst-plugins-base
Branch: master
Commit: a8f51d61f7e55d48b38b481ec0d50206b06e896e
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=a8f51d61f7e55d48b38b481ec0d50206b06e896e

Author: Patrick Radizi <pat...@ax...>
Date:   Thu Feb 18 12:42:53 2010 +0000

rtspconnection: make sure not to dereference NULL username or password

Fixes #610268.

---

 gst-libs/gst/rtsp/gstrtspconnection.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/gst-libs/gst/rtsp/gstrtspconnection.c b/gst-libs/gst/rtsp/gstrtspconnection.c
index 813eefd..e501fe6 100644
--- a/gst-libs/gst/rtsp/gstrtspconnection.c
+++ b/gst-libs/gst/rtsp/gstrtspconnection.c
@@ -946,6 +946,9 @@ add_auth_header (GstRTSPConnection * conn, GstRTSPMessage * message)
       gchar *user_pass64;
       gchar *auth_string;
 
+      if (conn->username == NULL || conn->passwd == NULL)
+        break;
+
       user_pass = g_strdup_printf ("%s:%s", conn->username, conn->passwd);
       user_pass64 = g_base64_encode ((guchar *) user_pass, strlen (user_pass));
       auth_string = g_strdup_printf ("Basic %s", user_pass64);
@@ -967,7 +970,8 @@ add_auth_header (GstRTSPConnection * conn, GstRTSPMessage * message)
       const gchar *method;
 
       /* we need to have some params set */
-      if (conn->auth_params == NULL)
+      if (conn->auth_params == NULL || conn->username == NULL ||
+          conn->passwd == NULL)
         break;
 
       /* we need the realm and nonce */