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

Commit 99df8ab0 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "fastboot: switch to ZipEntry64." am: ed149082 am: d8e53a0e am: 21ba06c1 

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

Change-Id: Iecd29a46a3041bade9634249ab7d9e2316e0c1f2
parents 14f501f3 21ba06c1

fastboot/fastboot.cpp

+6 −3
Original line number Diff line number Diff line
@@ -527,12 +527,15 @@ static std::vector<char> LoadBootableImage(const std::string& kernel, const std: 


static bool UnzipToMemory(ZipArchiveHandle zip, const std::string& entry_name,

                          std::vector<char>* out) {

    ZipEntry zip_entry;

    ZipEntry64 zip_entry;

    if (FindEntry(zip, entry_name, &zip_entry) != 0) {

        fprintf(stderr, "archive does not contain '%s'\n", entry_name.c_str());

        return false;

    }



    if (zip_entry.uncompressed_length > std::numeric_limits<size_t>::max()) {

      die("entry '%s' is too large: %" PRIu64, entry_name.c_str(), zip_entry.uncompressed_length);

    }

    out->resize(zip_entry.uncompressed_length);



    fprintf(stderr, "extracting %s (%zu MB) to RAM...\n", entry_name.c_str(),
@@ -638,14 +641,14 @@ static void delete_fbemarker_tmpdir(const std::string& dir) { 
static int unzip_to_file(ZipArchiveHandle zip, const char* entry_name) {

    unique_fd fd(make_temporary_fd(entry_name));



    ZipEntry zip_entry;

    ZipEntry64 zip_entry;

    if (FindEntry(zip, entry_name, &zip_entry) != 0) {

        fprintf(stderr, "archive does not contain '%s'\n", entry_name);

        errno = ENOENT;

        return -1;

    }



    fprintf(stderr, "extracting %s (%" PRIu32 " MB) to disk...", entry_name,

    fprintf(stderr, "extracting %s (%" PRIu64 " MB) to disk...", entry_name,

            zip_entry.uncompressed_length / 1024 / 1024);

    double start = now();

    int error = ExtractEntryToFile(zip, &zip_entry, fd);