Skip to content

V
vlc-1.1
Commit c1993b62 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Added vlc_b64_encode_binary (include/vlc_strings.h is not that a good place). 

Use vlc_b64_encode_binary and remove ap_* in rtp.c
Fixed 2 invalid memory access and 1 stack corruption in rtp.c (Fixed
the report of rtp segfault with gcc 4.1 by xxcv)
parent e732cff5
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 111 deletions
include/vlc_strings.h
View file @ c1993b62
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
VLC_EXPORT( void, resolve_xml_special_chars, ( char *psz_value ) ); VLC_EXPORT( void, resolve_xml_special_chars, ( char *psz_value ) );
VLC_EXPORT( char *, convert_xml_special_chars, ( const char *psz_content ) ); VLC_EXPORT( char *, convert_xml_special_chars, ( const char *psz_content ) );
VLC_EXPORT( char *, vlc_b64_encode_binary, ( const uint8_t *, size_t ) );
VLC_EXPORT( char *, vlc_b64_encode, ( const char * ) ); VLC_EXPORT( char *, vlc_b64_encode, ( const char * ) );
VLC_EXPORT( char *, str_format_time, ( const char * ) ); VLC_EXPORT( char *, str_format_time, ( const char * ) );
......
modules/stream_out/rtp.c
View file @ c1993b62
...@@ -436,7 +436,8 @@ static int Open( vlc_object_t *p_this ) ...@@ -436,7 +436,8 @@ static int Open( vlc_object_t *p_this )
if( *val.psz_string ) if( *val.psz_string )
{ {
sout_access_out_t *p_grab; sout_access_out_t *p_grab;
char *psz_rtpmap, url[NI_MAXHOST + 8], access[17], psz_ttl[5], ipv; const char *psz_rtpmap;
char url[NI_MAXHOST + 8], access[17], psz_ttl[5], ipv;
if( b_rtsp ) if( b_rtsp )
{ {
...@@ -938,68 +939,6 @@ static void sprintf_hexa( char *s, uint8_t *p_data, int i_data ) ...@@ -938,68 +939,6 @@ static void sprintf_hexa( char *s, uint8_t *p_data, int i_data )
s[2*i_data] = '\0'; s[2*i_data] = '\0';
} }
static const char basis_64[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
int ap_base64encode_len(int len)
{
return ((len + 2) / 3 * 4) + 1;
}
int ap_base64encode_binary(char *encoded,
const unsigned char *string, int len)
{
int i;
char *p;
p = encoded;
for (i = 0; i < len - 2; i += 3) {
*p++ = basis_64[(string[i] >> 2) & 0x3F];
*p++ = basis_64[((string[i] & 0x3) << 4) |
((int) (string[i + 1] & 0xF0) >> 4)];
*p++ = basis_64[((string[i + 1] & 0xF) << 2) |
((int) (string[i + 2] & 0xC0) >> 6)];
*p++ = basis_64[string[i + 2] & 0x3F];
}
if (i < len) {
*p++ = basis_64[(string[i] >> 2) & 0x3F];
if (i == (len - 1)) {
*p++ = basis_64[((string[i] & 0x3) << 4)];
*p++ = '=';
}
else {
*p++ = basis_64[((string[i] & 0x3) << 4) |
((int) (string[i + 1] & 0xF0) >> 4)];
*p++ = basis_64[((string[i + 1] & 0xF) << 2)];
}
*p++ = '=';
}
*p++ = '\0';
return p - encoded;
}
int ap_base64encode(char *encoded, const char *string, int len)
{
return ap_base64encode_binary(encoded, (const unsigned char *) string, len);
}
char *b64_encode(char *buf, int len)
{
int elen;
char *out;
if(len == 0)
len = strlen(buf);
elen = ap_base64encode_len(len);
out = (char *) malloc(sizeof(char) * (elen + 1));
ap_base64encode(out, buf, len);
return out;
}
static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{ {
sout_instance_t *p_sout = p_stream->p_sout; sout_instance_t *p_sout = p_stream->p_sout;
...@@ -1155,62 +1094,58 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -1155,62 +1094,58 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
id->i_clock_rate = 90000; id->i_clock_rate = 90000;
id->psz_rtpmap = strdup( "H264/90000" ); id->psz_rtpmap = strdup( "H264/90000" );
id->pf_packetize = rtp_packetize_h264; id->pf_packetize = rtp_packetize_h264;
id->psz_fmtp = NULL;
if( p_fmt->i_extra > 0 ) if( p_fmt->i_extra > 0 )
{ {
uint8_t *p_buffer = p_fmt->p_extra; uint8_t *p_buffer = p_fmt->p_extra;
int i_buffer = p_fmt->i_extra; int i_buffer = p_fmt->i_extra;
char *p_64_sps = NULL; char *p_64_sps = NULL;
char *p_64_pps = NULL; char *p_64_pps = NULL;
char hexa[6]; char hexa[6+1];
while( i_buffer > 4 && while( i_buffer > 4 &&
p_buffer[0] == 0 && p_buffer[1] == 0 && p_buffer[0] == 0 && p_buffer[1] == 0 &&
p_buffer[2] == 0 && p_buffer[3] == 1 ) p_buffer[2] == 0 && p_buffer[3] == 1 )
{ {
const int i_nal_type = p_buffer[4]&0x1f; const int i_nal_type = p_buffer[4]&0x1f;
int i_offset = 1; int i_offset;
int i_size = 0; int i_size = 0;
int i_startcode = 0;
int i_encoded = 0;
msg_Dbg( p_stream, "we found a startcode for NAL with TYPE:%d", i_nal_type ); msg_Dbg( p_stream, "we found a startcode for NAL with TYPE:%d", i_nal_type );
for( i_offset = 1; i_offset+3 < i_buffer ; i_offset++) i_size = i_buffer;
for( i_offset = 4; i_offset+3 < i_buffer ; i_offset++)
{ {
if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && p_buffer[i_offset+2] == 0 && p_buffer[i_offset+3] == 1 ) if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && p_buffer[i_offset+2] == 0 && p_buffer[i_offset+3] == 1 )
{ {
/* we found another startcode */ /* we found another startcode */
i_startcode = i_offset; i_size = i_offset;
break; break;
} }
} }
i_size = i_startcode ? i_startcode : i_buffer;
if( i_nal_type == 7 ) if( i_nal_type == 7 )
{ {
p_64_sps = (char *)malloc( ap_base64encode_len( i_size - 4) ); p_64_sps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 );
i_encoded = ap_base64encode_binary( p_64_sps, &p_buffer[4], i_size - 4 );
p_64_sps[i_encoded] = '\0';
sprintf_hexa( hexa, &p_buffer[5], 3 ); sprintf_hexa( hexa, &p_buffer[5], 3 );
hexa[6] = '\0';
} }
if( i_nal_type == 8 ) else if( i_nal_type == 8 )
{ {
p_64_pps = (char *)malloc( ap_base64encode_len( i_size - 4) ); p_64_pps = vlc_b64_encode_binary( &p_buffer[4], i_size - 4 );
i_encoded = ap_base64encode_binary( p_64_pps, &p_buffer[4], i_size - 4 );
p_64_pps[i_encoded] = '\0';
} }
i_buffer -= i_size; i_buffer -= i_size;
p_buffer += i_size; p_buffer += i_size;
} }
/* FIXME: All this is a bit unsafe */ /* */
asprintf( &id->psz_fmtp, "packetization-mode=1;profile-level-id=%s;sprop-parameter-sets=%s,%s;", hexa, p_64_sps, p_64_pps ); if( p_64_sps && p_64_pps )
free( p_64_sps ); asprintf( &id->psz_fmtp, "packetization-mode=1;profile-level-id=%s;sprop-parameter-sets=%s,%s;", hexa, p_64_sps, p_64_pps );
free( p_64_pps ); if( p_64_sps )
free( p_64_sps );
if( p_64_pps )
free( p_64_pps );
} }
else if( !id->psz_fmtp )
id->psz_fmtp = strdup( "packetization-mode=1" ); id->psz_fmtp = strdup( "packetization-mode=1" );
if( p_fmt->i_extra > 0 )
msg_Dbg( p_stream, "WE HAVE %d bytes extra data", p_fmt->i_extra );
break; break;
case VLC_FOURCC( 'm', 'p', '4', 'v' ): case VLC_FOURCC( 'm', 'p', '4', 'v' ):
......
src/text/strings.c
View file @ c1993b62
...@@ -329,46 +329,45 @@ char *convert_xml_special_chars( const char *psz_content ) ...@@ -329,46 +329,45 @@ char *convert_xml_special_chars( const char *psz_content )
} }
/* Base64 encoding */ /* Base64 encoding */
char *vlc_b64_encode( const char *src ) char *vlc_b64_encode_binary( const uint8_t *src, size_t i_src )
{ {
static const char b64[] = static const char b64[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
size_t len = strlen( src );
const uint8_t *in = (const uint8_t *)src;
char *ret; char *ret = malloc( ( i_src + 4 ) * 4 / 3 );
char *dst = (char *)malloc( ( len + 4 ) * 4 / 3 ); char *dst = ret;
if( dst == NULL ) if( dst == NULL )
return NULL; return NULL;
ret = dst; while( i_src > 0 )
while( len > 0 )
{ {
/* pops (up to) 3 bytes of input, push 4 bytes */ /* pops (up to) 3 bytes of input, push 4 bytes */
uint32_t v = *in++ << 24; // 1/3 uint32_t v;
*dst++ = b64[v >> 26]; // 1/4
/* 1/3 -> 1/4 */
v = *src++ << 24;
*dst++ = b64[v >> 26];
v = v << 6; v = v << 6;
if( len >= 2 ) /* 2/3 -> 2/4 */
v |= *in++ << 22; // 2/3 if( i_src >= 2 )
*dst++ = b64[v >> 26]; // 2/4 v |= *src++ << 22;
*dst++ = b64[v >> 26];
v = v << 6; v = v << 6;
if( len >= 3 ) /* 3/3 -> 3/4 */
v |= *in++ << 20; // 3/3 if( i_src >= 3 )
*dst++ = ( len >= 2 ) ? b64[v >> 26] : '='; // 3/4 v |= *src++ << 20; // 3/3
*dst++ = ( i_src >= 2 ) ? b64[v >> 26] : '='; // 3/4
v = v << 6; v = v << 6;
*dst++ = ( len >= 3 ) ? b64[v >> 26] : '='; // 4/4 /* -> 4/4 */
*dst++ = ( i_src >= 3 ) ? b64[v >> 26] : '='; // 4/4
len--; if( i_src <= 3 )
if( len > 0 ) break;
{ i_src -= 3;
len--;
if( len > 0 )
len--;
}
} }
*dst = '\0'; *dst = '\0';
...@@ -376,6 +375,14 @@ char *vlc_b64_encode( const char *src ) ...@@ -376,6 +375,14 @@ char *vlc_b64_encode( const char *src )
return ret; return ret;
} }
char *vlc_b64_encode( const char *src )
{
if( src )
return vlc_b64_encode_binary( (const uint8_t*)src, strlen(src) );
else
return vlc_b64_encode_binary( (const uint8_t*)"", 0 );
}
/**************************************************************************** /****************************************************************************
* String formating functions * String formating functions
****************************************************************************/ ****************************************************************************/
......
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