diff options
| author | Martin Schwenke <martin@meltin.net> | 2016-07-27 17:43:34 +1000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2016-08-10 11:24:36 +0200 |
| commit | a614e603a9b019b2be38be0da304aa01e7a82f04 (patch) | |
| tree | ef0401089120b4bbf75d5963ed7357a285e11e63 | |
| parent | 2c8c82dd7fb110e5f5b7a5955a6d27a8f64c2fa9 (diff) | |
| download | samba-a614e603a9b019b2be38be0da304aa01e7a82f04.tar.gz | |
ctdb-utils: Fix CID 1297451 Explicit null dereferenced (FORWARD_NULL)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12110
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit d46960f20e795cd4abc1c727705f77b2f0e0e564)
| -rw-r--r-- | ctdb/utils/ping_pong/ping_pong.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ctdb/utils/ping_pong/ping_pong.c b/ctdb/utils/ping_pong/ping_pong.c index be43a1d704d..f7f2eb1ed16 100644 --- a/ctdb/utils/ping_pong/ping_pong.c +++ b/ctdb/utils/ping_pong/ping_pong.c @@ -142,7 +142,9 @@ static void ping_pong(int fd, int num_locks) val = (unsigned char *)calloc(num_locks+1, sizeof(unsigned char)); if (val == NULL) { printf("calloc failed\n"); - munmap(p, num_locks+1); + if (use_mmap) { + munmap(p, num_locks+1); + } return; } |