[svn-commits] dvossel: branch 1.6.0 r232272 - in /branches/1.6.0: ./ funcs/func_groupcount.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Wed Dec  2 09:45:26 2009
New Revision: 232272

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

................
  r232269 | dvossel | 2009-12-02 09:42:54 -0600 (Wed, 02 Dec 2009) | 15 lines
  
  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:
    branches/1.6.0/   (props changed)
    branches/1.6.0/funcs/func_groupcount.c

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

Modified: branches/1.6.0/funcs/func_groupcount.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/funcs/func_groupcount.c?view=diff&rev=232272&r1=232271&r2=232272
==============================================================================
--- branches/1.6.0/funcs/func_groupcount.c (original)
+++ branches/1.6.0/funcs/func_groupcount.c Wed Dec  2 09:45:26 2009
@@ -136,6 +136,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);