diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 18:23:53 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 18:23:53 +0200 |
| commit | 8d8befaeca0d9ed3f096780e499a3231f16585c4 (patch) | |
| tree | 36afcf98e28dd7bba95e383d397e4f6ad84cbf01 /plugins | |
| parent | f8d9aad08222f59ba2d27437c1e2369896452aa1 (diff) | |
| parent | 23dac82b684e966490de707a44144b3ad0ce2323 (diff) | |
| download | rsyslog-8d8befaeca0d9ed3f096780e499a3231f16585c4.tar.gz rsyslog-8d8befaeca0d9ed3f096780e499a3231f16585c4.tar.xz rsyslog-8d8befaeca0d9ed3f096780e499a3231f16585c4.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
tests/Makefile.am
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/imudp/imudp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c index c7e8c1d4..773ba7a4 100644 --- a/plugins/imudp/imudp.c +++ b/plugins/imudp/imudp.c @@ -107,7 +107,7 @@ static rsRetVal addListner(void __attribute__((unused)) *pVal, uchar *pNewVal) udpLstnSocks = newSocks; } else { /* we need to add them */ - if((tmpSocks = malloc(sizeof(int) * 1 + newSocks[0] + udpLstnSocks[0])) == NULL) { + if((tmpSocks = malloc(sizeof(int) * (1 + newSocks[0] + udpLstnSocks[0]))) == NULL) { dbgprintf("out of memory trying to allocate udp listen socket array\n"); /* in this case, we discard the new sockets but continue with what we * already have |