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

Commit 40449f0d authored by Sen Jiang's avatar Sen Jiang Committed by android-build-merger
Browse files

Merge "Match LZMA SDK 18.05 API." am: 3607fe67 am: b4403da5

am: 983e84e8

Change-Id: I3082933477a552ff5ad19dc5386ffb1258845e08
parents 9f7b3828 983e84e8
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ Memory* ElfInterface::CreateGnuDebugdataMemory() {

  ISzAlloc alloc;
  CXzUnpacker state;
  alloc.Alloc = [](void*, size_t size) { return malloc(size); };
  alloc.Free = [](void*, void* ptr) { return free(ptr); };
  alloc.Alloc = [](ISzAllocPtr, size_t size) { return malloc(size); };
  alloc.Free = [](ISzAllocPtr, void* ptr) { return free(ptr); };

  XzUnpacker_Construct(&state, &alloc);

@@ -106,7 +106,7 @@ Memory* ElfInterface::CreateGnuDebugdataMemory() {
      dst_remaining += 2 * gnu_debugdata_size_;
    }
    return_val = XzUnpacker_Code(&state, dst->GetPtr(dst_offset), &dst_remaining, &src[src_offset],
                                 &src_remaining, CODER_FINISH_ANY, &status);
                                 &src_remaining, true, CODER_FINISH_ANY, &status);
    src_offset += src_remaining;
    dst_offset += dst_remaining;
  } while (return_val == SZ_OK && status == CODER_STATUS_NOT_FINISHED);