From: Terry Wilson <twilson@digium.com>
Date: Thu, 25 Jun 2009 20:25:39 +0000 (+0000)
Subject: Merged revisions 203311 via svnmerge from
X-Git-Tag: 11.0.0-beta1~4609
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3814caadad9756cd4ef83458784cafcf0679b787;p=thirdparty%2Fasterisk.git

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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@203338 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/cli.c b/main/cli.c
index d1d4bb3a29..d8814f05c2 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -235,7 +235,9 @@ static char *complete_fn(const char *word, int state)
 		c += (strlen(ast_config_AST_MODULE_DIR) + 1);
 	if (c)
 		c = ast_strdup(c);
-	free(d);
+	if (d) {
+		free(d);
+	}
 	
 	return c;
 }