diff options
| author | Shawn Willden <swillden@google.com> | 2015-01-20 11:44:43 -0700 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-01-20 11:44:43 -0700 |
| commit | 2dbe752a441cf8487b9b81772271e5abd18d0475 (patch) | |
| tree | b048d2ceb2c05994ea67230e3d80a693e7a29c7c /serializable.cpp | |
| parent | 29d898717bc48ca59cd3fb1e30efdad36f13ccec (diff) | |
| download | keymaster-2dbe752a441cf8487b9b81772271e5abd18d0475.tar.gz | |
Revert "Remove redundant NULL checks on calls to memset_s."
This reverts commit 356f6d4cf3d236e375a84e24b11359a5c1f1081f.
Diffstat (limited to 'serializable.cpp')
| -rw-r--r-- | serializable.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/serializable.cpp b/serializable.cpp index d0917da..9cfbac7 100644 --- a/serializable.cpp +++ b/serializable.cpp @@ -131,7 +131,8 @@ bool Buffer::Deserialize(const uint8_t** buf_ptr, const uint8_t* end) { } void Buffer::Clear() { - memset_s(buffer_.get(), 0, buffer_size_); + if (buffer_.get()) + memset_s(buffer_.get(), 0, buffer_size_); buffer_.reset(); read_position_ = 0; write_position_ = 0; |