[asterisk-commits] russell: trunk r95025 - in /trunk: ./ main/channel.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Thu Dec 27 15:41:23 CST 2007


Author: russell
Date: Thu Dec 27 15:41:22 2007
New Revision: 95025

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

........
r95024 | russell | 2007-12-27 15:40:02 -0600 (Thu, 27 Dec 2007) | 9 lines

Don't report a syntax error when an empty string is passed to ast_get_group.
Just return 0.

(closes issue #11540)
Reported by: tzafrir
Patches: 
      group_empty.diff uploaded by tzafrir (license 46)
	   -- slightly changed by me

........

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

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

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=95025&r1=95024&r2=95025
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Thu Dec 27 15:41:22 2007
@@ -4482,6 +4482,9 @@
 	int start=0, finish=0, x;
 	ast_group_t group = 0;
 
+	if (ast_strlen_zero(s))
+		return 0;
+
 	c = ast_strdupa(s);
 	
 	while ((piece = strsep(&c, ","))) {




More information about the asterisk-commits mailing list