diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2005-10-25 09:38:08 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2005-10-25 09:38:08 +0000 |
| commit | fa603d41674c6b412da07a3272964a229486863d (patch) | |
| tree | c4176135341bb509c715779c5e45e0068c4aa909 /syslogd.c | |
| parent | 572570db2bbb83aa27c5e9a2acb74d0edac8109b (diff) | |
| download | rsyslog-fa603d41674c6b412da07a3272964a229486863d.tar.gz rsyslog-fa603d41674c6b412da07a3272964a229486863d.tar.xz rsyslog-fa603d41674c6b412da07a3272964a229486863d.zip | |
fixed two bugs: tcp sender could cause dump core; termination could cause
dump core
Diffstat (limited to 'syslogd.c')
| -rw-r--r-- | syslogd.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1038,7 +1038,7 @@ int TCPSend(struct filed *f, char *msg) if((*(msg+len-1) != '\n')) { if(buf != NULL) free(buf); - if((buf = malloc((len + 1) * sizeof(char))) == NULL) { + if((buf = malloc((len + 2) * sizeof(char))) == NULL) { /* extreme mem shortage, try to solve * as good as we can. No point in calling * any alarms, they might as well run out @@ -4274,7 +4274,8 @@ void die(sig) free(f->f_iov); } /* Now delete cached messages */ - MsgDestruct(f->f_pMsg); + if(f->f_pMsg != NULL) + MsgDestruct(f->f_pMsg); #ifdef WITH_DB if (f->f_type == F_MYSQL) closeMySQL(f); |