diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-09-09 18:15:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-09 18:15:45 +0000 |
| commit | 3c952454f90c08bb3678979fc89bb7c3d30d5a3a (patch) | |
| tree | 05397553b11e54b93bc23668df768331cce422eb | |
| parent | 1be00e563e8d4e65f94dc85ed68b893010d2070d (diff) | |
| parent | c82514bd034f214b16d273b10c676dd63a9e603b (diff) | |
| download | extras-3c952454f90c08bb3678979fc89bb7c3d30d5a3a.tar.gz | |
Merge "verity: Do not increment data when it is nullptr." into android10-release
| -rw-r--r-- | verity/hash_tree_builder.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/verity/hash_tree_builder.cpp b/verity/hash_tree_builder.cpp index 197c38e5..d061ca5c 100644 --- a/verity/hash_tree_builder.cpp +++ b/verity/hash_tree_builder.cpp @@ -197,7 +197,9 @@ bool HashTreeBuilder::Update(const unsigned char* data, size_t len) { return false; } leftover_.clear(); - data += append_len; + if (data != nullptr) { + data += append_len; + } len -= append_len; } if (len % block_size_ != 0) { |