StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'tux3-nullptr-1'

Browse Source
This commit is contained in:
irungentoo 2014-06-18 16:36:08 -04:00
commit 5f06aba419
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toxav/msi.c
View File

@ -928,13 +928,13 @@ MSICall *init_call ( MSISession *session, int peers, int ringing_timeout )
MSICall *_call = session->calls[_call_idx]; MSICall *_call = session->calls[_call_idx];
_call->call_idx = _call_idx;
if ( _call == NULL ) { if ( _call == NULL ) {
LOGGER_WARNING("Allocation failed!"); LOGGER_WARNING("Allocation failed!");
return NULL; return NULL;
} }
_call->call_idx = _call_idx;
_call->type_peer = calloc ( sizeof ( MSICallType ), peers ); _call->type_peer = calloc ( sizeof ( MSICallType ), peers );
if ( _call->type_peer == NULL ) { if ( _call->type_peer == NULL ) {
@ -1026,9 +1026,11 @@ void *handle_timeout ( void *arg )
*/ */
MSICall *_call = arg; MSICall *_call = arg;
if (_call) {
LOGGER_DEBUG("[Call: %s] Request timed out!", _call->id); LOGGER_DEBUG("[Call: %s] Request timed out!", _call->id);
invoke_callback(_call->call_idx, MSI_OnRequestTimeout); invoke_callback(_call->call_idx, MSI_OnRequestTimeout);
}
if ( _call && _call->session ) { if ( _call && _call->session ) {