Skip to content

Toggle command fixes #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tcunha wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Toggle command fixes #29

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5c947e
Prevent crash when registering a toggle.
Dec 13, 2012
852e81d
Plug memory leak when removing a toggle.
Dec 13, 2012
bcb9cc7
It's valid to pass a NULL pointer to realloc.
Jan 9, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 10 additions & 20 deletions commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,28 +78,17 @@ void
toggle_list_add_command(toggle_list *t, char *cmd)
{
char **new_cmds;
int idx;
int new_size;

/* resize array */
if (t->size == 0) {
if ((t->commands = malloc(sizeof(char*))) == NULL)
err(1, "%s: malloc(3) failed", __FUNCTION__);
new_size = (t->size + 1) * sizeof *t->commands;
if ((new_cmds = realloc(t->commands, new_size)) == NULL)
err(1, "%s: realloc(3) failed", __FUNCTION__);
t->commands = new_cmds;

idx = 0;
t->size = 1;
} else {
int new_size = (t->size + 1) * sizeof(char*);
if ((new_cmds = realloc(t->commands, new_size)) == NULL)
err(1, "%s: realloc(3) failed", __FUNCTION__);

idx = t->size;
t->commands = new_cmds;
t->size++;
}

/* add command */
if ((t->commands[idx] = strdup(cmd)) == NULL)
if ((t->commands[t->size] = strdup(cmd)) == NULL)
err(1, "%s: strdup(3) failed", __FUNCTION__);

t->size++;
}

toggle_list*
Expand All @@ -125,7 +114,7 @@ toggle_list_create(int registr, int argc, char *argv[])
for (j = i; j < argc && strcmp("/", argv[j]); j++);

/* now collapse them into a single string */
cmd = argv2str(j - i + 1, argv + i);
cmd = argv2str(j - i, argv + i);
toggle_list_add_command(t, cmd);
free(cmd);

Expand Down Expand Up @@ -173,6 +162,7 @@ toggle_remove(int registr)

if (!found) return;

toggle_list_free(toggleset[idx]);
for (i = idx; i < toggleset_size - 1; i++)
toggleset[i] = toggleset[i + 1];

Expand Down