[asterisk-commits] russell: trunk r68359 - in /trunk: ./ main/say.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Thu Jun  7 18:17:01 2007
New Revision: 68359

URL: http://svn.digium.com/view/asterisk?view=rev&rev=68359
Log:
Merged revisions 68354 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r68354 | russell | 2007-06-07 18:14:45 -0500 (Thu, 07 Jun 2007) | 11 lines

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

........
r68351 | russell | 2007-06-07 18:13:33 -0500 (Thu, 07 Jun 2007) | 3 lines

Fix a problem where saying a character wouldn't properly break out when the caller pressed '#'
(issue #8113, reported by patbaker82, patch from jamesgolovich (hey, long time no see!) and patbaker82)

........

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

Modified:
    trunk/   (props changed)
    trunk/main/say.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/say.c
URL: http://svn.digium.com/view/asterisk/trunk/main/say.c?view=diff&rev=68359&r1=68358&r2=68359
==============================================================================
--- trunk/main/say.c (original)
+++ trunk/main/say.c Thu Jun  7 18:17:01 2007
@@ -67,7 +67,7 @@
 	int num = 0;
 	int res = 0;
 
-	while (str[num]) {
+	while (str[num] && !res) {
 		fn = NULL;
 		switch (str[num]) {
 		case ('*'):
@@ -142,7 +142,7 @@
 	int num = 0;
 	int res = 0;
 
-	while (str[num]) {
+	while (str[num] && !res) {
 		fn = NULL;
 		switch (str[num]) {
 		case ('*'):