[asterisk-commits] twilson: trunk r203338 - in /trunk: ./ main/cli.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Thu Jun 25 15:25:39 2009
New Revision: 203338

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

........
  r203311 | twilson | 2009-06-25 15:09:15 -0500 (Thu, 25 Jun 2009) | 2 lines
  
  Don't try to free NULL
........

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

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

Modified: trunk/main/cli.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/cli.c?view=diff&rev=203338&r1=203337&r2=203338
==============================================================================
--- trunk/main/cli.c (original)
+++ trunk/main/cli.c Thu Jun 25 15:25:39 2009
@@ -235,7 +235,9 @@
 		c += (strlen(ast_config_AST_MODULE_DIR) + 1);
 	if (c)
 		c = ast_strdup(c);
-	free(d);
+	if (d) {
+		free(d);
+	}
 	
 	return c;
 }