diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 19:01:34 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 19:01:34 +0200 |
| commit | 29cacc3c8ad6694b1ae2a5480fca7059773d06f0 (patch) | |
| tree | 1c4996d03a90ddb4ad6ea236ee8f72194a13b99e /plugins | |
| parent | cbbf1586a204a897a050b6cb294b120e3ff5f23c (diff) | |
| parent | d7c98e7a6ec28a6c76bccf16d83f36b34a705410 (diff) | |
| download | rsyslog-29cacc3c8ad6694b1ae2a5480fca7059773d06f0.tar.gz rsyslog-29cacc3c8ad6694b1ae2a5480fca7059773d06f0.tar.xz rsyslog-29cacc3c8ad6694b1ae2a5480fca7059773d06f0.zip | |
Merge branch 'master' into v5-devel
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 f3448095..a486b818 100644 --- a/plugins/imudp/imudp.c +++ b/plugins/imudp/imudp.c @@ -108,7 +108,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 |