[asterisk-commits] branch crichter/frame-data - r8096 in /team/crichter/frame-data: ./ channels/...

[asterisk-commits at lists.digium.com]

Author: crichter
Date: Mon Jan 16 02:12:24 2006
New Revision: 8096

URL: http://svn.digium.com/view/asterisk?rev=8096&view=rev
Log:
Merged revisions 8093-8094 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/crichter/0.3.0

................
r8093 | crichter | 2006-01-16 09:05:37 +0100 (Mo, 16 Jan 2006) | 1 line

fixed segfault with jitterbuffer
................
r8094 | crichter | 2006-01-16 09:06:53 +0100 (Mo, 16 Jan 2006) | 10 lines

Merged revisions 8074 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r8074 | tilghman | 2006-01-14 20:06:44 +0100 (Sa, 14 Jan 2006) | 2 lines

Bug 6238 - Fix segfault when delimiter not specified

........

................

Modified:
    team/crichter/frame-data/   (props changed)
    team/crichter/frame-data/channels/chan_misdn.c
    team/crichter/frame-data/funcs/func_strings.c

Propchange: team/crichter/frame-data/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 16 02:12:24 2006
@@ -1,1 +1,1 @@
-/team/crichter/0.3.0:1-8054
+/team/crichter/0.3.0:1-8095

Modified: team/crichter/frame-data/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/team/crichter/frame-data/channels/chan_misdn.c?rev=8096&r1=8095&r2=8096&view=diff
==============================================================================
--- team/crichter/frame-data/channels/chan_misdn.c (original)
+++ team/crichter/frame-data/channels/chan_misdn.c Mon Jan 16 02:12:24 2006
@@ -3454,6 +3454,7 @@
 			break;
 		}
 
+#if 1
 		{
 			struct chan_list *holded_ch=find_holded(cl_te, bc);
 			if (holded_ch) {
@@ -3463,6 +3464,7 @@
 				break;
 			}
 		}
+#endif
 		
 		if (AST_BRIDGED_P(ch->ast)){
 			ch->state = MISDN_HOLDED;
@@ -3961,6 +3963,8 @@
 {
     int i, j, rp, wp;
 
+    if (!jb || ! data) return 0;
+
     ast_mutex_lock (&jb->mutexjb);
     
     wp=jb->wp;

Modified: team/crichter/frame-data/funcs/func_strings.c
URL: http://svn.digium.com/view/asterisk/team/crichter/frame-data/funcs/func_strings.c?rev=8096&r1=8095&r2=8096&view=diff
==============================================================================
--- team/crichter/frame-data/funcs/func_strings.c (original)
+++ team/crichter/frame-data/funcs/func_strings.c Mon Jan 16 02:12:24 2006
@@ -50,8 +50,12 @@
 	if (delim) {
 		varname = strsep(&delim, "|");
 		pbx_retrieve_variable(chan, varname, &varval, workspace, sizeof(workspace), NULL);
-		while (strsep(&varval, delim))
-			fieldcount++;
+		if (delim) {
+			while (strsep(&varval, delim))
+				fieldcount++;
+		} else if (!ast_strlen_zero(varval)) {
+			fieldcount = 1;
+		}
 		snprintf(buf, len, "%d", fieldcount);
 	} else {
 		ast_log(LOG_ERROR, "Out of memory\n");