34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
X-Git-Url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blobdiff_plain;f=src%2Fhelper.c;h=c392eeced3e73762d3ea6a2f9fa27ab5ae389241;hp=33ba120ab39e3788719a18796b5b58338972e1e8;hb=69bc94779c2f035a9fffdb5327a54c3aeca73ed5;hpb=3052ce208acf602f0163166dcefb7330d537cedb
|
|
|
|
--- src/helper.c.orig
|
|
+++ src/helper.c
|
|
@@ -82,7 +82,8 @@ int create_helper(int event_fd, int err_
|
|
pid_t pid;
|
|
int i, pipefd[2];
|
|
struct sigaction sigact;
|
|
-
|
|
+ unsigned char *alloc_buff = NULL;
|
|
+
|
|
/* create the pipe through which the main program sends us commands,
|
|
then fork our process. */
|
|
if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1)
|
|
@@ -188,11 +189,16 @@ int create_helper(int event_fd, int err_
|
|
struct script_data data;
|
|
char *p, *action_str, *hostname = NULL, *domain = NULL;
|
|
unsigned char *buf = (unsigned char *)daemon->namebuff;
|
|
- unsigned char *end, *extradata, *alloc_buff = NULL;
|
|
+ unsigned char *end, *extradata;
|
|
int is6, err = 0;
|
|
int pipeout[2];
|
|
|
|
- free(alloc_buff);
|
|
+ /* Free rarely-allocated memory from previous iteration. */
|
|
+ if (alloc_buff)
|
|
+ {
|
|
+ free(alloc_buff);
|
|
+ alloc_buff = NULL;
|
|
+ }
|
|
|
|
/* we read zero bytes when pipe closed: this is our signal to exit */
|
|
if (!read_write(pipefd[0], (unsigned char *)&data, sizeof(data), 1))
|