commit 1834d5f82a7ad5884c184fd22c702ac9d915af45
author Shawn Willden <swillden@google.com> Mon Dec 08 12:41:59 2014 -0700
committer Shawn Willden <swillden@google.com> Thu Jan 22 16:35:35 2015 -0700
tree eb018bc40f4f546748a297a96522b2fd2d3283be
parent b7361134bff4d3d7ef1d5a3c60e50c9952dc2b56

Remove redundant NULL checks on calls to memset_s.

This change was already reviewed, merged and reverted, so I'm skipping
the review step this time.

Change-Id: I6f7ecb71fc03b9a821c81e1bc0f54952225d9da8

authorization_set.cpp

diff --git a/authorization_set.cpp b/authorization_set.cpp
index ed64c9b..e4d8ba3 100644
--- a/authorization_set.cpp
+++ b/authorization_set.cpp
@@ -345,10 +345,8 @@
 }
 
 void AuthorizationSet::FreeData() {
-    if (elems_ != NULL)
-        memset_s(elems_, 0, elems_size_ * sizeof(keymaster_key_param_t));
-    if (indirect_data_ != NULL)
-        memset_s(indirect_data_, 0, indirect_data_size_);
+    memset_s(elems_, 0, elems_size_ * sizeof(keymaster_key_param_t));
+    memset_s(indirect_data_, 0, indirect_data_size_);
 
     delete[] elems_;
     delete[] indirect_data_;