sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Fix memory leak

Browse source 
* Take over maintainer

Feature safe:	yes
Approved by:	bapt
Approved by:	eadler (mentor)
This commit is contained in:
Tom Judge 2012-11-10 18:26:36 +00:00
parent b7bec7d93b
commit 00ddaefdf4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=307299
2 changed files with 62 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
devel/libcli/Makefile
View file

@ -2,10 +2,11 @@
PORTNAME= libcli
PORTVERSION= 1.9.6
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://cloud.github.com/downloads/dparrish/libcli/
MAINTAINER= bapt@FreeBSD.org
MAINTAINER= tj@FreeBSD.org
COMMENT= Emulates a Cisco style command-line interface
LICENSE= LGPL21

60
devel/libcli/files/patch-libcli.c Normal file
View file

@ -0,0 +1,60 @@
diff --git a/libcli.c b/libcli.c
index de6e2e9..59dd42f 100644
--- libcli.c
+++ libcli.c
@@ -1017,7 +1017,7 @@ static int cli_get_completions(struct cli_def *cli, const char *command, char **
{
struct cli_command *c;
struct cli_command *n;
- int num_words, i, k=0;
+ int num_words, save_words, i, k=0;
char *words[CLI_MAX_LINE_WORDS] = {0};
int filter = 0;
@@ -1025,12 +1025,12 @@ static int cli_get_completions(struct cli_def *cli, const char *command, char **
while (isspace(*command))
command++;
- num_words = cli_parse_line(command, words, sizeof(words)/sizeof(words[0]));
+ save_words = num_words = cli_parse_line(command, words, sizeof(words)/sizeof(words[0]));
if (!command[0] || command[strlen(command)-1] == ' ')
num_words++;
if (!num_words)
- return 0;
+ goto out;
for (i = 0; i < num_words; i++)
{
@@ -1043,7 +1043,7 @@ static int cli_get_completions(struct cli_def *cli, const char *command, char **
unsigned len = 0;
if (filter < num_words - 1) // filter already completed
- return 0;
+ goto out;
if (filter == num_words - 1)
len = strlen(words[num_words-1]);
@@ -1055,7 +1055,7 @@ static int cli_get_completions(struct cli_def *cli, const char *command, char **
}
completions[k] = NULL;
- return k;
+ goto out;
}
for (c = cli->commands, i = 0; c && i < num_words && k < max_completions; c = n)
@@ -1084,6 +1084,10 @@ static int cli_get_completions(struct cli_def *cli, const char *command, char **
completions[k++] = c->command;
}
+out:
+ for (i = 0; i < save_words; i++)
+ free(words[i]);
+
return k;
}
--
1.7.10