diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 18:34:17 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-05-28 18:34:17 +0200 |
| commit | d7c98e7a6ec28a6c76bccf16d83f36b34a705410 (patch) | |
| tree | 66807ada649997bb6e5c8928a6a95870f43d926e /plugins | |
| parent | c6a2dafb2fc5d186ef146035f270a4819075eab1 (diff) | |
| parent | 8d8befaeca0d9ed3f096780e499a3231f16585c4 (diff) | |
| download | rsyslog-d7c98e7a6ec28a6c76bccf16d83f36b34a705410.tar.gz rsyslog-d7c98e7a6ec28a6c76bccf16d83f36b34a705410.tar.xz rsyslog-d7c98e7a6ec28a6c76bccf16d83f36b34a705410.zip | |
Merge branch 'beta' into master
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 |