Bug 925896 - Signaling - Addref when adding sessiondata_t to hash r=abr

This commit is contained in:
Ethan Hugg 2013-10-22 13:14:43 -07:00
parent 1222a2dfe4
commit fdecaf06b3

View File

@ -1521,6 +1521,8 @@ static void ccappUpdateSessionData (session_update_t *sessUpd)
if ((CCAPI_DeviceInfo_isPhoneIdle(handle) == TRUE) && (sendResetUpdates)) {
resetNotReady();
}
/* Increment the refcount before putting it in the hashtable */
CCAPI_Call_retainCallInfo(data);
(void) addhash(data->sess_id, data);
}
@ -1582,12 +1584,11 @@ static void ccappUpdateSessionData (session_update_t *sessUpd)
// find and deep free then delete
sess_data_p = (session_data_t *)findhash(sessUpd->sessionID);
if ( sess_data_p != NULL ){
cleanSessionData(sess_data_p);
if ( 0 > delhash(sessUpd->sessionID) ) {
APP_ERR_MSG (DEB_F_PREFIX"failed to delete hash sessid=0x%08x",
DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname),sessUpd->sessionID);
DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname),sessUpd->sessionID);
}
cpr_free(sess_data_p);
CCAPI_Call_releaseCallInfo(sess_data_p);
}
if ( (gCCApp.inPreservation || (gCCApp.cucm_mode == FALLBACK)) && isNoCallExist()) {
/* The phone is now Idle. Clear the inPreservation Flag */
@ -1641,13 +1642,12 @@ static void ccappUpdateSessionData (session_update_t *sessUpd)
// find and deep free then delete
sess_data_p = (session_data_t *)findhash(sessUpd->sessionID);
if ( sess_data_p != NULL ){
cleanSessionData(sess_data_p);
if ( 0 > delhash(sessUpd->sessionID) ) {
APP_ERR_MSG (DEB_F_PREFIX"failed to delete hash sessid=0x%08x",
DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname),sessUpd->sessionID);
}
cpr_free(sess_data_p);
data = NULL;
APP_ERR_MSG (DEB_F_PREFIX"failed to delete hash sessid=0x%08x",
DEB_F_PREFIX_ARGS(SIP_CC_PROV, fname),sessUpd->sessionID);
}
CCAPI_Call_releaseCallInfo(sess_data_p);
data = NULL;
}
if ((gCCApp.inPreservation || (gCCApp.cucm_mode == FALLBACK)) && isNoCallExist()) {
/* The phone is now Idle. Clear the inPreservation Flag */