[svn-commits] russell: trunk r318058 - in /trunk: ./ res/res_config_curl.c

[SVN commits to the Digium repositories]

Author: russell
Date: Sat May  7 18:36:41 2011
New Revision: 318058

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

........
  r318057 | russell | 2011-05-07 18:35:37 -0500 (Sat, 07 May 2011) | 8 lines
  
  res_config_curl: fix a crash with static realtime.
  
  (closes issue #18413)
  Reported by: jmls
  Patches:
        20101202__issue18413.diff.txt uploaded by tilghman (license 14)
  Tested by: jmls
........

Modified:
    trunk/   (props changed)
    trunk/res/res_config_curl.c

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

Modified: trunk/res/res_config_curl.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_config_curl.c?view=diff&rev=318058&r1=318057&r2=318058
==============================================================================
--- trunk/res/res_config_curl.c (original)
+++ trunk/res/res_config_curl.c Sat May  7 18:36:41 2011
@@ -575,7 +575,7 @@
 				return NULL;
 		}
 
-		if (strcmp(category, cur_cat) || last_cat_metric != cat_metric) {
+		if (!cat || strcmp(category, cur_cat) || last_cat_metric != cat_metric) {
 			if (!(cat = ast_category_new(category, "", 99999)))
 				break;
 			cur_cat = category;