diff --git a/ChangeLog b/ChangeLog
index f2360e2c75..c5c8078311 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-14  Wim Taymans,,,  <wim@fluendo.com>
+
+	Patch by: jp.liu <jp_liu at astrocom dot cn>
+
+	* gst/rtsp/rtspurl.c: (rtsp_url_parse):
+	Fix parsing of password field in url. Fixes #407797.
+
 2007-02-14  Wim Taymans,,,  <wim@fluendo.com>
 
 	* gst/wavparse/gstwavparse.c: (gst_wavparse_class_init),
diff --git a/gst/rtsp/rtspurl.c b/gst/rtsp/rtspurl.c
index dd735565f1..6ef0220e1e 100644
--- a/gst/rtsp/rtspurl.c
+++ b/gst/rtsp/rtspurl.c
@@ -95,7 +95,7 @@ rtsp_url_parse (const gchar * urlstr, RTSPUrl ** url)
 
     res->user = g_strndup (p, col - p);
     col++;
-    res->passwd = g_strndup (col, col - at);
+    res->passwd = g_strndup (col, at - col);
 
     /* move to host */
     p = at + 1;