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

Commit fbcc431f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[incremental/adb] fix signature size check" am: 1c5a205f 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1373276

Change-Id: I676de9e59f89c8711268afaf4b9a3caf705f7cab
parents 9fc97b85 1c5a205f

adb/client/incremental.cpp

+3 −3
Original line number Diff line number Diff line
@@ -55,9 +55,10 @@ static std::pair<unique_fd, std::vector<char>> read_signature(Size file_size, 
        return {};

    }



    std::vector<char> invalid_signature;

    auto [signature, tree_size] = read_id_sig_headers(fd);



    if (st.st_size > kMaxSignatureSize) {

    std::vector<char> invalid_signature;

    if (signature.size() > kMaxSignatureSize) {

        if (!silent) {

            fprintf(stderr, "Signature is too long. Max allowed is %d. Abort.\n",

                    kMaxSignatureSize);
@@ -65,7 +66,6 @@ static std::pair<unique_fd, std::vector<char>> read_signature(Size file_size, 
        return {std::move(fd), std::move(invalid_signature)};

    }



    auto [signature, tree_size] = read_id_sig_headers(fd);

    if (auto expected = verity_tree_size_for_file(file_size); tree_size != expected) {

        if (!silent) {

            fprintf(stderr,