From 96b41f639dd14acf389342f3166274204546319a Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 7 Mar 2012 15:04:33 +0100 Subject: [PATCH] sanlock: Use STREQ_NULLABLE instead of STREQ on strings that may be null The function sanlock_inquire can return NULL in the state string if the message consists only of a header. The return value is arbitrary and sent by the server. We should proceed carefully while touching such pointers. --- src/locking/lock_driver_sanlock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 295e45d98b..d344d6ae46 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -828,7 +828,7 @@ static int virLockManagerSanlockRelease(virLockManagerPtr lock, return -1; } - if (STREQ(*state, "")) + if (STREQ_NULLABLE(*state, "")) VIR_FREE(*state); } @@ -871,7 +871,7 @@ static int virLockManagerSanlockInquire(virLockManagerPtr lock, return -1; } - if (STREQ(*state, "")) + if (STREQ_NULLABLE(*state, "")) VIR_FREE(*state); return 0; -- 2.47.2