mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plug memory leak around argv2string() (patch by Andre Guibert de Bruet)

Browse Source
This commit is contained in:
marschap
2008-12-13 08:03:53 +00:00
parent ff75ce809f
commit 064ed18866
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/commands/menu_commands.c
+15 -8
View File
@@ -47,15 +47,17 @@ int set_successor(MenuItem *item, char *itemid, Client *client);
static char *argv2string(int argc, char **argv)
{
char *rtn = NULL;
int len;
int i;
unsigned int len;
unsigned int i;
for (i = len = 0; i < argc; i++)
len += strlen(argv[i]) + 1;
rtn = malloc(len + 1);
rtn[0] = '\0';
for (i = len = 0; i < argc; i++) {
strcat(rtn, argv[i]);
strcat(rtn, " ");
if (rtn != NULL) {
rtn[0] = '\0';
for (i = 0; i < argc; i++) {
strcat(rtn, argv[i]);
strcat(rtn, " ");
}
}
return rtn;
}
@@ -437,10 +439,15 @@ menu_set_item_func(Client *c, int argc, char **argv)
MenuItem *item;
char *menu_id;
char *item_id;
char *tmp_argv;
int argnr;
debug(RPT_DEBUG, "%s(Client [%d]: %s)",
__FUNCTION__, c->sock, argv2string(argc, argv));
tmp_argv = argv2string(argc, argv);
if (tmp_argv != NULL) {
debug(RPT_DEBUG, "%s(Client [%d]: %s)",
__FUNCTION__, c->sock, tmp_argv);
free(tmp_argv);
}
if (c->state != ACTIVE)
return 1;