diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-14 14:37:40 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-14 14:37:40 +0100 |
| commit | 8ca7467ed408965b44864b507e734e209d35338a (patch) | |
| tree | 07c049cd8789addebc6a269fa4ab80ae6055cdda | |
| parent | 48c0875b15fac19d06ebcfb5902ab35c0f1f112e (diff) | |
| download | rsyslog-8ca7467ed408965b44864b507e734e209d35338a.tar.gz rsyslog-8ca7467ed408965b44864b507e734e209d35338a.tar.xz rsyslog-8ca7467ed408965b44864b507e734e209d35338a.zip | |
fixed double-free regerssion, probably caused by last merge
| -rw-r--r-- | plugins/imfile/imfile.c | 5 | ||||
| -rwxr-xr-x | tests/diag.sh | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c index 61aa9b4f..37d3136c 100644 --- a/plugins/imfile/imfile.c +++ b/plugins/imfile/imfile.c @@ -294,11 +294,6 @@ BEGINrunInput int i; int bHadFileData; /* were there at least one file with data during this run? */ CODESTARTrunInput - /* free config vars that are still allocated (at this point, we do no longer need them) */ - free(pszFileName); - free(pszFileTag); - free(pszStateFile); - pthread_cleanup_push(inputModuleCleanup, NULL); while(glbl.GetGlobalInputTermState() == 0) { do { diff --git a/tests/diag.sh b/tests/diag.sh index 55eb4f8d..b8b55f11 100755 --- a/tests/diag.sh +++ b/tests/diag.sh @@ -41,7 +41,7 @@ case $1 in ;; 'startup-vg') # start rsyslogd with default params under valgrind control. $2 is the config file name to use # returns only after successful startup, $3 is the instance (blank or 2!) - valgrind --error-exitcode=10 --malloc-fill=ff --free-fill=fe --leak-check=full ../tools/rsyslogd -c6 -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 & + valgrind --log-fd=1 --error-exitcode=10 --malloc-fill=ff --free-fill=fe --leak-check=full ../tools/rsyslogd -c6 -u2 -n -irsyslog$3.pid -M../runtime/.libs:../.libs -f$srcdir/testsuites/$2 & $srcdir/diag.sh wait-startup $3 ;; 'wait-startup') # wait for rsyslogd startup ($2 is the instance) |