Commit b5addf95 authored by Simon Morlat's avatar Simon Morlat
Browse files

fix crash when receiving an incorrect SDP message in a 200Ok.

fix indentation
parent 24186bff
...@@ -351,7 +351,8 @@ static void call_accepted(SalOp *op){ ...@@ -351,7 +351,8 @@ static void call_accepted(SalOp *op){
#endif //BUILD_UPNP #endif //BUILD_UPNP
md=sal_call_get_final_media_description(op); md=sal_call_get_final_media_description(op);
call->params.has_video &= linphone_core_media_description_contains_video_stream(md); if (md)
call->params.has_video &= linphone_core_media_description_contains_video_stream(md);
if (call->state==LinphoneCallOutgoingProgress || if (call->state==LinphoneCallOutgoingProgress ||
call->state==LinphoneCallOutgoingRinging || call->state==LinphoneCallOutgoingRinging ||
......
...@@ -85,19 +85,19 @@ static const char *days[]={"Sun","Mon","Tue","Wed","Thu","Fri","Sat"}; ...@@ -85,19 +85,19 @@ static const char *days[]={"Sun","Mon","Tue","Wed","Thu","Fri","Sat"};
static const char *months[]={"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"}; static const char *months[]={"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"};
static void msg_add_current_date(osip_message_t *msg){ static void msg_add_current_date(osip_message_t *msg){
char tmp[64]={0}; char tmp[64]={0};
time_t curtime=time(NULL); time_t curtime=time(NULL);
struct tm *ret; struct tm *ret;
#ifndef WIN32 #ifndef WIN32
struct tm gmt; struct tm gmt;
ret=gmtime_r(&curtime,&gmt); ret=gmtime_r(&curtime,&gmt);
#else #else
ret=gmtime(&curtime); ret=gmtime(&curtime);
#endif #endif
/*cannot use strftime because it is locale dependant*/ /*cannot use strftime because it is locale dependant*/
snprintf(tmp,sizeof(tmp)-1,"%s, %i %s %i %02i:%02i:%02i GMT", snprintf(tmp,sizeof(tmp)-1,"%s, %i %s %i %02i:%02i:%02i GMT",
days[ret->tm_wday],ret->tm_mday,months[ret->tm_mon],1900+ret->tm_year,ret->tm_hour,ret->tm_min,ret->tm_sec); days[ret->tm_wday],ret->tm_mday,months[ret->tm_mon],1900+ret->tm_year,ret->tm_hour,ret->tm_min,ret->tm_sec);
osip_message_replace_header(msg,"Date",tmp); osip_message_replace_header(msg,"Date",tmp);
} }
......
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