From 0c481598be65652e10dda95cb1a8dfb624d23879 Mon Sep 17 00:00:00 2001 From: Murai Takashi Date: Sun, 26 Jan 2020 20:37:33 +0900 Subject: [PATCH] nfs4: Fix PVS V595 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move NULL check for 'fReply' and 'fRequest', since they might be NULL. Change-Id: Icc42b8f24f406d6752c25f4203d6ebe3f6ba0d97 Reviewed-on: https://review.haiku-os.org/c/haiku/+/2168 Reviewed-by: Jérôme Duval --- src/add-ons/kernel/file_systems/nfs4/ReplyBuilder.cpp | 5 ++++- src/add-ons/kernel/file_systems/nfs4/RequestBuilder.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/file_systems/nfs4/ReplyBuilder.cpp b/src/add-ons/kernel/file_systems/nfs4/ReplyBuilder.cpp index 152d5de25b..9dc3d30948 100644 --- a/src/add-ons/kernel/file_systems/nfs4/ReplyBuilder.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/ReplyBuilder.cpp @@ -46,10 +46,13 @@ ReplyBuilder::_InitHeader() RPC::CallbackReply* ReplyBuilder::Reply() { + if (fReply == NULL) + return NULL; + fReply->Stream().InsertUInt(fStatusPosition, _HaikuErrorToNFS4(fStatus)); fReply->Stream().InsertUInt(fOpCountPosition, fOpCount); - if (fReply == NULL || fReply->Stream().Error() == B_OK) + if (fReply->Stream().Error() == B_OK) return fReply; else return NULL; diff --git a/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.cpp b/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.cpp index 3ee50fe18d..9b2d8a2943 100644 --- a/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.cpp @@ -806,10 +806,13 @@ RequestBuilder::ReleaseLockOwner(OpenState* state, LockOwner* owner) RPC::Call* RequestBuilder::Request() { + if (fRequest == NULL) + return NULL; + if (fProcedure == ProcCompound) fRequest->Stream().InsertUInt(fOpCountPosition, fOpCount); - if (fRequest == NULL || fRequest->Stream().Error() == B_OK) + if (fRequest->Stream().Error() == B_OK) return fRequest; else return NULL;