mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-23 14:36:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp: Made parse_string() return a result.

Browse source 
This will catch parsing errors when a too long string is received.
This commit is contained in:
Peter Kjellerstedt 2009-06-10 13:11:31 +02:00
parent fdd5a65632
commit 5716cd102a
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gst-libs/gst/rtsp/gstrtspconnection.c
View file

@ -118,7 +118,7 @@ static GstRTSPResult read_line (GstRTSPConnection * conn, guint8 * buffer,
guint * idx, guint size); guint * idx, guint size);
static GstRTSPResult parse_key_value (guint8 * buffer, gchar * key, static GstRTSPResult parse_key_value (guint8 * buffer, gchar * key,
guint keysize, gchar ** value); guint keysize, gchar ** value);
static void parse_string (gchar * dest, gint size, gchar ** src); static GstRTSPResult parse_string (gchar * dest, gint size, gchar ** src);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#define READ_SOCKET(fd, buf, len) recv (fd, (char *)buf, len, 0) #define READ_SOCKET(fd, buf, len) recv (fd, (char *)buf, len, 0)
@ -1477,9 +1477,10 @@ no_message:
} }
} }
static void static GstRTSPResult
parse_string (gchar * dest, gint size, gchar ** src) parse_string (gchar * dest, gint size, gchar ** src)
{ {
GstRTSPResult res = GST_RTSP_OK;
gint idx; gint idx;
idx = 0; idx = 0;
@ -1490,10 +1491,14 @@ parse_string (gchar * dest, gint size, gchar ** src)
while (!g_ascii_isspace (**src) && **src != '\0') { while (!g_ascii_isspace (**src) && **src != '\0') {
if (idx < size - 1) if (idx < size - 1)
dest[idx++] = **src; dest[idx++] = **src;
else
res = GST_RTSP_EPARSE;
(*src)++; (*src)++;
} }
if (size > 0) if (size > 0)
dest[idx] = '\0'; dest[idx] = '\0';
return res;
} }
static void static void
@ -1566,9 +1571,11 @@ parse_response_status (guint8 * buffer, GstRTSPMessage * msg)
bptr = (gchar *) buffer; bptr = (gchar *) buffer;
parse_string (versionstr, sizeof (versionstr), &bptr); if (parse_string (versionstr, sizeof (versionstr), &bptr) != GST_RTSP_OK)
res = GST_RTSP_EPARSE;
parse_string (codestr, sizeof (codestr), &bptr); if (parse_string (codestr, sizeof (codestr), &bptr) != GST_RTSP_OK)
res = GST_RTSP_EPARSE;
code = atoi (codestr); code = atoi (codestr);
if (G_UNLIKELY (*codestr == '\0' || code < 0 || code >= 600)) if (G_UNLIKELY (*codestr == '\0' || code < 0 || code >= 600))
res = GST_RTSP_EPARSE; res = GST_RTSP_EPARSE;
@ -1601,14 +1608,17 @@ parse_request_line (guint8 * buffer, GstRTSPMessage * msg)
bptr = (gchar *) buffer; bptr = (gchar *) buffer;
parse_string (methodstr, sizeof (methodstr), &bptr); if (parse_string (methodstr, sizeof (methodstr), &bptr) != GST_RTSP_OK)
res = GST_RTSP_EPARSE;
method = gst_rtsp_find_method (methodstr); method = gst_rtsp_find_method (methodstr);
parse_string (urlstr, sizeof (urlstr), &bptr); if (parse_string (urlstr, sizeof (urlstr), &bptr) != GST_RTSP_OK)
res = GST_RTSP_EPARSE;
if (G_UNLIKELY (*urlstr == '\0')) if (G_UNLIKELY (*urlstr == '\0'))
res = GST_RTSP_EPARSE; res = GST_RTSP_EPARSE;
parse_string (versionstr, sizeof (versionstr), &bptr); if (parse_string (versionstr, sizeof (versionstr), &bptr) != GST_RTSP_OK)
res = GST_RTSP_EPARSE;
if (G_UNLIKELY (*bptr != '\0')) if (G_UNLIKELY (*bptr != '\0'))
res = GST_RTSP_EPARSE; res = GST_RTSP_EPARSE;