summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorTerry Wilson <twilson@digium.com>2009-06-25 20:25:39 +0000
committerTerry Wilson <twilson@digium.com>2009-06-25 20:25:39 +0000
commit3814caadad9756cd4ef83458784cafcf0679b787 (patch)
tree4e330f95fa656d5a9ad4ab8b33b6c24c30fa8eb7 /main
parent5c7da226e48c1da48bd5e4756645d342955b2d16 (diff)
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
Diffstat (limited to 'main')
-rw-r--r--main/cli.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/main/cli.c b/main/cli.c
index d1d4bb3a2..d8814f05c 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;
}