[asterisk-commits] kmoore: branch kmoore/stasis-bridging-channel_events r385234 - in /team/kmoor...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Wed Apr 10 10:30:57 CDT 2013


Author: kmoore
Date: Wed Apr 10 10:30:53 2013
New Revision: 385234

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=385234
Log:
Multiple revisions 385175,385215

........
  r385175 | root | 2013-04-10 09:17:49 -0500 (Wed, 10 Apr 2013) | 35 lines
  
  Fix crash in chan_sip when a core initiated op occurs at the same time as a BYE
  
  When a BYE request is processed in chan_sip, the current SIP dialog is detached
  from its associated Asterisk channel structure. The tech_pvt pointer in the
  channel object is set to NULL, and the dialog persists for an RFC mandated
  period of time to handle re-transmits.
  
  While this process occurs, the channel is locked (which is good).
  Unfortunately, operations that are initiated externally have no way of knowing
  that the channel they've just obtained (which is still valid) and that they are
  attempting to lock is about to have its tech_pvt pointer removed. By the time
  they obtain the channel lock and call the channel technology callback, the
  tech_pvt is NULL.
  
  This patch adds a few checks to some channel callbacks that make sure the
  tech_pvt isn't NULL before using it. Prime offenders were the DTMF digit
  callbacks, which would crash if AMI initiated a DTMF on the channel at the
  same time as a BYE was received from the UA. This patch also adds checks on
  sip_transfer (as AMI can also cause a callback into this function), as well
  as sip_indicate (as lots of things can queue an indication onto a channel).
  
  Review: https://reviewboard.asterisk.org/r/2434/
  
  (closes issue ASTERISK-20225)
  Reported by: Jeff Hoppe
  ........
  
  Merged revisions 385170 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........
  
  Merged revisions 385173 from http://svn.asterisk.org/svn/asterisk/branches/11
  ........
  
  Merged revisions 385174 from file:///srv/subversion/repos/asterisk/trunk
........
  r385215 | root | 2013-04-10 10:17:20 -0500 (Wed, 10 Apr 2013) | 28 lines
  
  Use LDAP memory management functions instead of Asterisk's
  
  When MALLOC_DEBUG is enabled with res_config_ldap, issues (munmap_chunk:
  invalid pointer errors) can occur as the memory is being allocated with
  Asterisk's wrappers around malloc/calloc/free/strdup, as opposed to the
  LDAP library's wrappers.
  
  This patch uses the LDAP library's wrappers where appropriate, so that
  compiling with MALLOC_DEBUG doesn't cause more problems than it solves.
  
  Note that the patch listed below was modified slightly for this commit
  to account for some additional memory allocation/deallocations.
  
  (closes issue ASTERISK-17386)
  Reported by: John Covert
  Tested by: Andrew Latham
  patches:
    issue18789-1.8-r316873.patch uploaded by seanbright (License 5060)
  ........
  
  Merged revisions 385190 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........
  
  Merged revisions 385199 from http://svn.asterisk.org/svn/asterisk/branches/11
  ........
  
  Merged revisions 385202 from file:///srv/subversion/repos/asterisk/trunk
........

Merged revisions 385175,385215 from http://svn.asterisk.org/svn/asterisk/team/group/bridge_construction

Modified:
    team/kmoore/stasis-bridging-channel_events/   (props changed)
    team/kmoore/stasis-bridging-channel_events/channels/chan_sip.c
    team/kmoore/stasis-bridging-channel_events/res/res_config_ldap.c

Propchange: team/kmoore/stasis-bridging-channel_events/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Propchange: team/kmoore/stasis-bridging-channel_events/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 10 10:30:53 2013
@@ -1,1 +1,1 @@
-/team/group/bridge_construction:1-385166
+/team/group/bridge_construction:1-385233

Modified: team/kmoore/stasis-bridging-channel_events/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridging-channel_events/channels/chan_sip.c?view=diff&rev=385234&r1=385233&r2=385234
==============================================================================
--- team/kmoore/stasis-bridging-channel_events/channels/chan_sip.c (original)
+++ team/kmoore/stasis-bridging-channel_events/channels/chan_sip.c Wed Apr 10 10:30:53 2013
@@ -7352,6 +7352,11 @@
 	int res = 0;
 	struct sip_pvt *p = ast_channel_tech_pvt(ast);
 
+	if (!p) {
+		ast_debug(1, "Asked to answer channel %s without tech pvt; ignoring\n",
+				ast_channel_name(ast));
+		return res;
+	}
 	sip_pvt_lock(p);
 	if (ast_channel_state(ast) != AST_STATE_UP) {
 		try_suggested_sip_codec(p);
@@ -7521,6 +7526,12 @@
 	struct sip_pvt *p = ast_channel_tech_pvt(ast);
 	int res = 0;
 
+	if (!p) {
+		ast_debug(1, "Asked to begin DTMF digit on channel %s with no pvt; ignoring\n",
+				ast_channel_name(ast));
+		return res;
+	}
+
 	sip_pvt_lock(p);
 	switch (ast_test_flag(&p->flags[0], SIP_DTMF)) {
 	case SIP_DTMF_INBAND:
@@ -7544,6 +7555,12 @@
 {
 	struct sip_pvt *p = ast_channel_tech_pvt(ast);
 	int res = 0;
+
+	if (!p) {
+		ast_debug(1, "Asked to end DTMF digit on channel %s with no pvt; ignoring\n",
+				ast_channel_name(ast));
+		return res;
+	}
 
 	sip_pvt_lock(p);
 	switch (ast_test_flag(&p->flags[0], SIP_DTMF)) {
@@ -7570,6 +7587,12 @@
 	struct sip_pvt *p = ast_channel_tech_pvt(ast);
 	int res;
 
+	if (!p) {
+		ast_debug(1, "Asked to transfer channel %s with no pvt; ignoring\n",
+				ast_channel_name(ast));
+		return -1;
+	}
+
 	if (dest == NULL)	/* functions below do not take a NULL */
 		dest = "";
 	sip_pvt_lock(p);
@@ -7764,6 +7787,12 @@
 {
 	struct sip_pvt *p = ast_channel_tech_pvt(ast);
 	int res = 0;
+
+	if (!p) {
+		ast_debug(1, "Asked to indicate condition on channel %s with no pvt; ignoring\n",
+				ast_channel_name(ast));
+		return res;
+	}
 
 	sip_pvt_lock(p);
 	switch(condition) {

Modified: team/kmoore/stasis-bridging-channel_events/res/res_config_ldap.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridging-channel_events/res/res_config_ldap.c?view=diff&rev=385234&r1=385233&r2=385234
==============================================================================
--- team/kmoore/stasis-bridging-channel_events/res/res_config_ldap.c (original)
+++ team/kmoore/stasis-bridging-channel_events/res/res_config_ldap.c Wed Apr 10 10:30:53 2013
@@ -1279,14 +1279,14 @@
 	}
 
 	mods_size = 2; /* one for the first param/value pair and one for the the terminating NULL */
-	ldap_mods = ast_calloc(sizeof(LDAPMod *), mods_size);
-	ldap_mods[0] = ast_calloc(1, sizeof(LDAPMod));
+	ldap_mods = ldap_memcalloc(sizeof(LDAPMod *), mods_size);
+	ldap_mods[0] = ldap_memcalloc(1, sizeof(LDAPMod));
 
 	ldap_mods[0]->mod_op = LDAP_MOD_REPLACE;
-	ldap_mods[0]->mod_type = ast_strdup(newparam);
+	ldap_mods[0]->mod_type = ldap_strdup(newparam);
 
 	ldap_mods[0]->mod_values = ast_calloc(sizeof(char *), 2);
-	ldap_mods[0]->mod_values[0] = ast_strdup(newval);
+	ldap_mods[0]->mod_values[0] = ldap_strdup(newval);
 
 	while ((newparam = va_arg(ap, const char *))) {
 		newparam = convert_attribute_name_to_ldap(table_config, newparam);
@@ -1296,7 +1296,7 @@
 		for (i = 0; i < mods_size - 1; i++) {
 			if (ldap_mods[i]&& !strcmp(ldap_mods[i]->mod_type, newparam)) {
 				/* We have the parameter allready, adding the value as a semicolon delimited value */
-				ldap_mods[i]->mod_values[0] = ast_realloc(ldap_mods[i]->mod_values[0], sizeof(char) * (strlen(ldap_mods[i]->mod_values[0]) + strlen(newval) + 2));
+				ldap_mods[i]->mod_values[0] = ldap_memrealloc(ldap_mods[i]->mod_values[0], sizeof(char) * (strlen(ldap_mods[i]->mod_values[0]) + strlen(newval) + 2));
 				strcat(ldap_mods[i]->mod_values[0], ";");
 				strcat(ldap_mods[i]->mod_values[0], newval);
 				mod_exists = 1;	
@@ -1307,12 +1307,12 @@
 		/* create new mod */
 		if (!mod_exists) {
 			mods_size++;
-			ldap_mods = ast_realloc(ldap_mods, sizeof(LDAPMod *) * mods_size);
+			ldap_mods = ldap_memrealloc(ldap_mods, sizeof(LDAPMod *) * mods_size);
 			ldap_mods[mods_size - 1] = NULL;
 			
-			ldap_mods[mods_size - 2] = ast_calloc(1, sizeof(LDAPMod));
-
-			ldap_mods[mods_size - 2]->mod_type = ast_calloc(sizeof(char), strlen(newparam) + 1);
+			ldap_mods[mods_size - 2] = ldap_memcalloc(1, sizeof(LDAPMod));
+
+			ldap_mods[mods_size - 2]->mod_type = ldap_memcalloc(sizeof(char), strlen(newparam) + 1);
 			strcpy(ldap_mods[mods_size - 2]->mod_type, newparam);
 
 			if (strlen(newval) == 0) {
@@ -1320,8 +1320,8 @@
 			} else {
 				ldap_mods[mods_size - 2]->mod_op = LDAP_MOD_REPLACE;
 
-				ldap_mods[mods_size - 2]->mod_values = ast_calloc(sizeof(char *), 2);
-				ldap_mods[mods_size - 2]->mod_values[0] = ast_calloc(sizeof(char), strlen(newval) + 1);
+				ldap_mods[mods_size - 2]->mod_values = ldap_memcalloc(sizeof(char *), 2);
+				ldap_mods[mods_size - 2]->mod_values[0] = ldap_memcalloc(sizeof(char), strlen(newval) + 1);
 				strcpy(ldap_mods[mods_size - 2]->mod_values[0], newval);
 			}
 		}




More information about the asterisk-commits mailing list