[svn-commits] dvossel: trunk r232269 - in /trunk: ./ funcs/func_groupcount.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Wed Dec  2 09:42:54 2009
New Revision: 232269

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

........
  r232268 | dvossel | 2009-12-02 09:41:36 -0600 (Wed, 02 Dec 2009) | 9 lines
  
  fixes segfault in func_groupcount
  
  closes issue #16337)
  Reported by: Parantido
  Patches:
        issue_16337.diff uploaded by dvossel (license 671)
  	  Tested by: Parantido, dvossel
........

Modified:
    trunk/   (props changed)
    trunk/funcs/func_groupcount.c

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

Modified: trunk/funcs/func_groupcount.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_groupcount.c?view=diff&rev=232269&r1=232268&r2=232269
==============================================================================
--- trunk/funcs/func_groupcount.c (original)
+++ trunk/funcs/func_groupcount.c Wed Dec  2 09:42:54 2009
@@ -195,6 +195,10 @@
 				char *data, const char *value)
 {
 	char grpcat[256];
+
+	if (!value) {
+		return -1;
+	}
 
 	if (!ast_strlen_zero(data)) {
 		snprintf(grpcat, sizeof(grpcat), "%s@%s", value, data);