[svn-commits] jpeeler: branch 1.6.0 r121138 - in /branches/1.6.0: ./ apps/

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Sat Jun  7 20:18:52 2008
New Revision: 121138

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

........
r121131 | jpeeler | 2008-06-07 20:16:25 -0500 (Sat, 07 Jun 2008) | 2 lines

Fixes segfault when using ParkAndAnnounce. Also, loop made more efficient as announce template only needs to be checked until the number of colon separated arguments run out, not the entire pointer storage array. Was done in a similiar fashion in 1.4, but here we're using less variables.

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_parkandannounce.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_parkandannounce.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_parkandannounce.c?view=diff&rev=121138&r1=121137&r2=121138
==============================================================================
--- branches/1.6.0/apps/app_parkandannounce.c (original)
+++ branches/1.6.0/apps/app_parkandannounce.c Sat Jun  7 20:18:52 2008
@@ -144,9 +144,12 @@
 
 	ast_verb(4, "Announce Template:%s\n", args.template);
 
-	for (looptemp = 0, tmp[looptemp++] = strsep(&args.template, ":");
-		 looptemp < sizeof(tmp) / sizeof(tmp[0]);
-		 tmp[looptemp++] = strsep(&args.template, ":"));
+	for (looptemp = 0; looptemp < sizeof(tmp) / sizeof(tmp[0]); looptemp++) {
+		if ((tmp[looptemp] = strsep(&args.template, ":")) != NULL)
+			continue;
+		else
+			break;
+	}
 
 	for (i = 0; i < looptemp; i++) {
 		ast_verb(4, "Announce:%s\n", tmp[i]);