[svn-commits] rmudgett: branch rmudgett/cid r265272 - in /team/rmudgett/cid: ./ addons/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Mon May 24 09:34:12 2010
New Revision: 265272

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=265272
Log:
Merged revisions 265227 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r265227 | may | 2010-05-23 13:23:38 -0500 (Sun, 23 May 2010) | 2 lines
  
  small changes to avoiding 'freeing unused memory...'
........

Modified:
    team/rmudgett/cid/   (props changed)
    team/rmudgett/cid/addons/chan_ooh323.c

Propchange: team/rmudgett/cid/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/rmudgett/cid/
------------------------------------------------------------------------------
--- cid-integrated (original)
+++ cid-integrated Mon May 24 09:34:12 2010
@@ -1,1 +1,1 @@
-/trunk:1-265174
+/trunk:1-265271

Modified: team/rmudgett/cid/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/cid/addons/chan_ooh323.c?view=diff&rev=265272&r1=265271&r2=265272
==============================================================================
--- team/rmudgett/cid/addons/chan_ooh323.c (original)
+++ team/rmudgett/cid/addons/chan_ooh323.c Mon May 24 09:34:12 2010
@@ -1237,8 +1237,9 @@
 	case AST_CONTROL_SRCCHANGE:
 		ast_rtp_instance_change_source(p->rtp);
 		break;
-      case AST_CONTROL_CONNECTED_LINE:
-		if (!ast->connected.id.XXX_name.valid || !ast->connected.id.XXX_name.str) {
+	case AST_CONTROL_CONNECTED_LINE:
+		if (!ast->connected.id.XXX_name.valid
+			|| ast_strlen_zero(ast->connected.id.XXX_name.str)) {
 			break;
 		}
 		if (gH323Debug)