commit 2dbe752a441cf8487b9b81772271e5abd18d0475
author Shawn Willden <swillden@google.com> Tue Jan 20 11:44:43 2015 -0700
committer Shawn Willden <swillden@google.com> Tue Jan 20 11:44:43 2015 -0700
tree b048d2ceb2c05994ea67230e3d80a693e7a29c7c
parent 29d898717bc48ca59cd3fb1e30efdad36f13ccec

Revert "Remove redundant NULL checks on calls to memset_s."

This reverts commit 356f6d4cf3d236e375a84e24b11359a5c1f1081f.

authorization_set.cpp

diff --git a/authorization_set.cpp b/authorization_set.cpp
index e4d8ba3..ed64c9b 100644
--- a/authorization_set.cpp
+++ b/authorization_set.cpp
@@ -345,8 +345,10 @@
 }
 
 void AuthorizationSet::FreeData() {
-    memset_s(elems_, 0, elems_size_ * sizeof(keymaster_key_param_t));
-    memset_s(indirect_data_, 0, indirect_data_size_);
+    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_);
 
     delete[] elems_;
     delete[] indirect_data_;