Commit b0e2e3b8 authored by Pavlov Konstantin's avatar Pavlov Konstantin

Some more fixes from upstream xine:

* Fix program termination due to invalid Real Media SDP; reported by Roland
Kay. [bug #1602663]

CVS patchset: 8441
CVS date: 2006/12/25 16:12:16
parent d93b7a36
...@@ -91,7 +91,7 @@ static char *nl(char *data) { ...@@ -91,7 +91,7 @@ static char *nl(char *data) {
static int filter(const char *in, const char *filter, char **out) { static int filter(const char *in, const char *filter, char **out) {
int flen=strlen(filter); int flen=strlen(filter);
int len; size_t len;
if (!in) return 0; if (!in) return 0;
...@@ -179,12 +179,14 @@ static sdpplin_stream_t *sdpplin_parse_stream(char **data) { ...@@ -179,12 +179,14 @@ static sdpplin_stream_t *sdpplin_parse_stream(char **data) {
} }
if(filter(*data,"a=OpaqueData:buffer;",&buf)) { if(filter(*data,"a=OpaqueData:buffer;",&buf)) {
decoded = b64_decode(buf, decoded, &(desc->mlti_data_size)); decoded = b64_decode(buf, decoded, &(desc->mlti_data_size));
if ( decoded != NULL ) {
desc->mlti_data = malloc(sizeof(char)*desc->mlti_data_size); desc->mlti_data = malloc(sizeof(char)*desc->mlti_data_size);
memcpy(desc->mlti_data, decoded, desc->mlti_data_size); memcpy(desc->mlti_data, decoded, desc->mlti_data_size);
handled=1; handled=1;
*data=nl(*data); *data=nl(*data);
lprintf("mlti_data_size: %i\n", desc->mlti_data_size); lprintf("mlti_data_size: %i\n", desc->mlti_data_size);
} }
}
if(filter(*data,"a=ASMRuleBook:string;",&buf)) { if(filter(*data,"a=ASMRuleBook:string;",&buf)) {
desc->asm_rule_book=strdup(buf); desc->asm_rule_book=strdup(buf);
handled=1; handled=1;
...@@ -244,28 +246,36 @@ sdpplin_t *sdpplin_parse(char *data) { ...@@ -244,28 +246,36 @@ sdpplin_t *sdpplin_parse(char *data) {
} }
if(filter(data,"a=Title:buffer;",&buf)) { if(filter(data,"a=Title:buffer;",&buf)) {
decoded=b64_decode(buf, decoded, &len); decoded=b64_decode(buf, decoded, &len);
if ( decoded != NULL ) {
desc->title=strdup(decoded); desc->title=strdup(decoded);
handled=1; handled=1;
data=nl(data); data=nl(data);
} }
}
if(filter(data,"a=Author:buffer;",&buf)) { if(filter(data,"a=Author:buffer;",&buf)) {
decoded=b64_decode(buf, decoded, &len); decoded=b64_decode(buf, decoded, &len);
if ( decoded != NULL ) {
desc->author=strdup(decoded); desc->author=strdup(decoded);
handled=1; handled=1;
data=nl(data); data=nl(data);
} }
}
if(filter(data,"a=Copyright:buffer;",&buf)) { if(filter(data,"a=Copyright:buffer;",&buf)) {
decoded=b64_decode(buf, decoded, &len); decoded=b64_decode(buf, decoded, &len);
if ( decoded != NULL ) {
desc->copyright=strdup(decoded); desc->copyright=strdup(decoded);
handled=1; handled=1;
data=nl(data); data=nl(data);
} }
}
if(filter(data,"a=Abstract:buffer;",&buf)) { if(filter(data,"a=Abstract:buffer;",&buf)) {
decoded=b64_decode(buf, decoded, &len); decoded=b64_decode(buf, decoded, &len);
if ( decoded != NULL ) {
desc->abstract=strdup(decoded); desc->abstract=strdup(decoded);
handled=1; handled=1;
data=nl(data); data=nl(data);
} }
}
if(filter(data,"a=StreamCount:integer;",&buf)) { if(filter(data,"a=StreamCount:integer;",&buf)) {
desc->stream_count=atoi(buf); desc->stream_count=atoi(buf);
desc->stream = malloc(sizeof(sdpplin_stream_t*)*desc->stream_count); desc->stream = malloc(sizeof(sdpplin_stream_t*)*desc->stream_count);
......
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