Skip to content

V
vlc-1.1
Commit 1b2d090e authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Fix HTTP/RTSP crash on invalid request URI 

(cherry picked from commit a03617089bc045e343f94921f257cf71436f4812)
parent 2e33823b
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 4 deletions
src/network/httpd.c
View file @ 1b2d090e
...@@ -1755,16 +1755,27 @@ static void httpd_ClientRecv( httpd_client_t *cl ) ...@@ -1755,16 +1755,27 @@ static void httpd_ClientRecv( httpd_client_t *cl )
*p2++ = '\0'; *p2++ = '\0';
} }
if( !strncasecmp( p, ( cl->query.i_proto if( !strncasecmp( p, ( cl->query.i_proto
== HTTPD_PROTO_HTTP ) ? "http" : "rtsp", 4 ) == HTTPD_PROTO_HTTP ) ? "http:" : "rtsp:", 5 ) )
&& p[4 + !!strchr( "sS", p[4] )] == ':' )
{ /* Skip hier-part of URL (if present) */ { /* Skip hier-part of URL (if present) */
p = strchr( p, ':' ) + 1; /* skip URI scheme */ p += 5;
if( !strncmp( p, "//", 2 ) ) /* skip authority */ if( !strncmp( p, "//", 2 ) ) /* skip authority */
{ /* see RFC3986 §3.2 */ { /* see RFC3986 §3.2 */
p += 2; p += 2;
while( *p && !strchr( "/?#", *p ) ) p++; p += strcspn( p, "/?#" );
} }
} }
else
if( !strncasecmp( p, ( cl->query.i_proto
== HTTPD_PROTO_HTTP ) ? "https:" : "rtsps:", 6 ) )
{ /* Skip hier-part of URL (if present) */
p += 6;
if( !strncmp( p, "//", 2 ) ) /* skip authority */
{ /* see RFC3986 §3.2 */
p += 2;
p += strcspn( p, "/?#" );
}
}
cl->query.psz_url = strdup( p ); cl->query.psz_url = strdup( p );
if( ( p3 = strchr( cl->query.psz_url, '?' ) ) ) if( ( p3 = strchr( cl->query.psz_url, '?' ) ) )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment