Skip to content

plugin: avoid malloc in rc_plugin_run #993

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
N-R-K wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −5
Open

plugin: avoid malloc in rc_plugin_run #993

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions src/shared/plugin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ rc_plugin_run(RC_HOOK hook, const char *value)
sigset_t old;
int pfd[2];
pid_t pid;
char *buffer;
char buffer[BUFSIZ];
char *token;
char *p;
ssize_t nr;
Expand Down Expand Up @@ -169,10 +169,12 @@ rc_plugin_run(RC_HOOK hook, const char *value)

sigprocmask(SIG_SETMASK, &old, NULL);
close(pfd[1]);
buffer = xmalloc(sizeof(char) * BUFSIZ);
memset(buffer, 0, BUFSIZ);

while ((nr = read(pfd[0], buffer, BUFSIZ)) > 0) {
/* FIXME: this will be buggy if `read` cuts the buffer in the
* middle. getdelim() could work, but this function is
* currently being called from within a signal handler. */
while ((nr = read(pfd[0], buffer, sizeof(buffer) - 1)) > 0) {
buffer[nr] = '\0';
p = buffer;
while (*p && p - buffer < nr) {
token = strsep(&p, "=");
Expand All @@ -187,7 +189,6 @@ rc_plugin_run(RC_HOOK hook, const char *value)
}
}

free(buffer);
close(pfd[0]);

rc_waitpid(pid);
Expand Down
Loading