From bebfa29b486bfcd7bbaf7f7f888aadfb5bf9c730 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Fri, 17 Dec 2010 12:37:49 +0000 Subject: Fix NULL pointer check for *buf As ternary operator has lower priority then add operation, this check was not doing what seemed to be expected. So enclose the test in braces and check for NULL in *buf. --- daemons/clvmd/clvmd-command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'daemons/clvmd/clvmd-command.c') diff --git a/daemons/clvmd/clvmd-command.c b/daemons/clvmd/clvmd-command.c index 915fcc7e..49f11971 100644 --- a/daemons/clvmd/clvmd-command.c +++ b/daemons/clvmd/clvmd-command.c @@ -168,8 +168,8 @@ int do_command(struct local_client *client, struct clvm_header *msg, int msglen, /* Check the status of the command and return the error text */ if (status) { - *retlen = 1 + (*buf) ? dm_snprintf(*buf, buflen, "%s", - strerror(status)) : -1; + *retlen = 1 + ((*buf) ? dm_snprintf(*buf, buflen, "%s", + strerror(status)) : -1); } return status; -- cgit