diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-23 09:41:00 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-23 09:41:00 +0200 |
| commit | 1c4074259a1b9437ac7bd24b4e791dc98375209f (patch) | |
| tree | 5b338018628e1ea869854adc2f7ac3e21efd5bca /runtime/nsdpoll_ptcp.c | |
| parent | 2a4c68954b717b8c09221a86794c8a5573120726 (diff) | |
| parent | be0a6eb45830f486ea2ac755ee11f7503454aa08 (diff) | |
| download | rsyslog-1c4074259a1b9437ac7bd24b4e791dc98375209f.tar.gz rsyslog-1c4074259a1b9437ac7bd24b4e791dc98375209f.tar.bz2 rsyslog-1c4074259a1b9437ac7bd24b4e791dc98375209f.zip | |
Merge branch 'v7-stable'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/nsdpoll_ptcp.c')
| -rw-r--r-- | runtime/nsdpoll_ptcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/nsdpoll_ptcp.c b/runtime/nsdpoll_ptcp.c index e69c0fbb..8d95811a 100644 --- a/runtime/nsdpoll_ptcp.c +++ b/runtime/nsdpoll_ptcp.c @@ -66,7 +66,7 @@ addEvent(nsdpoll_ptcp_t *pThis, int id, void *pUsr, int mode, nsd_ptcp_t *pSock, nsdpoll_epollevt_lst_t *pNew; DEFiRet; - CHKmalloc(pNew = (nsdpoll_epollevt_lst_t*) malloc(sizeof(nsdpoll_epollevt_lst_t))); + CHKmalloc(pNew = (nsdpoll_epollevt_lst_t*) calloc(1, sizeof(nsdpoll_epollevt_lst_t))); pNew->id = id; pNew->pUsr = pUsr; pNew->pSock = pSock; |