Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ea515e6 authored by Tao Bao's avatar Tao Bao
Browse files

applypatch: Fix a potential nullptr dereferencing. 

Note that the code exists in debugging path only, and won't be hit
unless device has flaky flash.

Test: Run recovery_unit_test and recovery_component_test on marlin.
Change-Id: I0c71adc271f08f00e3eabd9d14cd8af3186c5bae
parent c059b6c1

applypatch/applypatch.cpp

+7 −4
Original line number Diff line number Diff line
@@ -622,10 +622,13 @@ static int GenerateTarget(const FileContents& source_file, const std::unique_ptr 
    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);



    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);

      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) {