Skip to content

V
vlc-2-2
Commit bd4e7c98 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

Stricter RFC1788 obeying UrlEncode

parent fd014e1e
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 7 deletions
include/network.h
View file @ bd4e7c98
...@@ -222,19 +222,23 @@ static inline void vlc_UrlClean( vlc_url_t *url ) ...@@ -222,19 +222,23 @@ static inline void vlc_UrlClean( vlc_url_t *url )
static inline char *vlc_UrlEncode( const char *psz_url ) static inline char *vlc_UrlEncode( const char *psz_url )
{ {
char *psz_enc, *out; char *psz_enc, *out;
const char *in; const unsigned char *in;
psz_enc = (char *)malloc( 3 * strlen( psz_url ) + 1 ); psz_enc = (char *)malloc( 3 * strlen( psz_url ) + 1 );
if( psz_enc == NULL ) if( psz_enc == NULL )
return NULL; return NULL;
out = psz_enc; out = psz_enc;
for( in = psz_url; *in; in++ ) for( in = (const unsigned char *)psz_url; *in; in++ )
{ {
unsigned char c = *(unsigned char *)in; unsigned char c = *in;
if( ( c <= 32 ) || ( c == '%' ) || ( c == '?' ) || ( c == '&' ) if( ( (unsigned char)( c - 'a' ) < 26 )
|| ( c == '+' ) || ( c >= 128 ) ) || ( (unsigned char)( c - 'A' ) < 26 )
|| ( (unsigned char)( c - '9' ) < 10 )
|| strchr( "$-_.+!*'(),", c ) != NULL )
*out++ = (char)c;
else
{ {
*out++ = '%'; *out++ = '%';
*out++ = ( ( c >> 4 ) >= 0xA ) ? 'A' + ( c >> 4 ) - 0xA *out++ = ( ( c >> 4 ) >= 0xA ) ? 'A' + ( c >> 4 ) - 0xA
...@@ -242,8 +246,6 @@ static inline char *vlc_UrlEncode( const char *psz_url ) ...@@ -242,8 +246,6 @@ static inline char *vlc_UrlEncode( const char *psz_url )
*out++ = ( ( c & 0xf ) >= 0xA ) ? 'A' + ( c & 0xf ) - 0xA *out++ = ( ( c & 0xf ) >= 0xA ) ? 'A' + ( c & 0xf ) - 0xA
: '0' + ( c & 0xf ); : '0' + ( c & 0xf );
} }
else
*out++ = (char)c;
} }
*out++ = '\0'; *out++ = '\0';
......
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