commit e02cbaaa629444772cdf92e35f1b2867084d30f9
author Tao Bao <tbao@google.com> Tue Jul 10 06:19:19 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 10 06:19:19 2018 +0000
tree 9ee75d9e178f99e7eb34a7b47e98e06f6d6e79ab
parent b9b50cd58c9864e9b12c3045531b67d5edb59fd0
parent 7c1d426dbc4f5539929247027e4bd1c33ec63471

Merge "applypatch: Restrict applypatch_check to eMMC targets."

applypatch/applypatch.cpp

diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp
index 6daa0d6..fc29493 100644
--- a/applypatch/applypatch.cpp
+++ b/applypatch/applypatch.cpp
@@ -624,10 +624,13 @@
     SHA1(reinterpret_cast<const uint8_t*>(patch->data.data()), patch->data.size(), patch_digest);
     LOG(ERROR) << "patch size " << patch->data.size() << " SHA-1 " << short_sha1(patch_digest);
 
-    uint8_t bonus_digest[SHA_DIGEST_LENGTH];
-    SHA1(reinterpret_cast<const uint8_t*>(bonus_data->data.data()), bonus_data->data.size(),
-         bonus_digest);
-    LOG(ERROR) << "bonus size " << bonus_data->data.size() << " SHA-1 " << short_sha1(bonus_digest);
+    if (bonus_data != nullptr) {
+      uint8_t bonus_digest[SHA_DIGEST_LENGTH];
+      SHA1(reinterpret_cast<const uint8_t*>(bonus_data->data.data()), bonus_data->data.size(),
+           bonus_digest);
+      LOG(ERROR) << "bonus size " << bonus_data->data.size() << " SHA-1 "
+                 << short_sha1(bonus_digest);
+    }
 
     // TODO(b/67849209) Remove after debugging the unit test flakiness.
     if (android::base::GetMinimumLogSeverity() <= android::base::LogSeverity::DEBUG) {