From ccf293127f0eecdf96e5f22acbdade1a116bf28c Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Tue, 12 Sep 2017 17:11:11 +0900 Subject: [PATCH] Fix static analysis issue - Check returned variable whether value is null or not. Change-Id: Ibdbce0375e5cde22e221990d49d42ddb634eb41d Signed-off-by: Junghyun Yeon --- src/common/certificate_validation.cc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/common/certificate_validation.cc b/src/common/certificate_validation.cc index c255b00..dcf1ad8 100644 --- a/src/common/certificate_validation.cc +++ b/src/common/certificate_validation.cc @@ -326,9 +326,12 @@ bool ValidatePrivilegeLevel(common_installer::PrivilegeLevel level, } if (status != PRVMGR_ERR_NONE) { std::string errnum = std::to_string(status); + if (error) + *error_message = error; + else + *error_message = ""; LOG(ERROR) << "Error while verifing privilege level: " - << (error ? error : "") << " <" << errnum << ">"; - *error_message = error; + << *error_message << " <" << errnum << ">"; *error_message += ":<" + errnum + ">"; free(error); return false; @@ -358,9 +361,12 @@ bool ValidateMetadataPrivilege(common_installer::PrivilegeLevel level, if (status != PRVMGR_ERR_NONE) { std::string errnum = std::to_string(status); + if (error) + *error_message = error; + else + *error_message = ""; LOG(ERROR) << "Error while verifing metadata privilege: " - << (error ? error : "") << " <" << errnum << ">"; - *error_message = error; + << *error_message << " <" << errnum << ">"; *error_message += ":<" + errnum + ">"; free(error); return false; -- 2.7.4