From 2ef03e0f010f280695d2e3c509ab48eee33ba959 Mon Sep 17 00:00:00 2001 From: Sen Jiang Date: Fri, 4 May 2018 12:56:04 -0700 Subject: [PATCH] Match LZMA SDK 18.05 API. Test: libunwindstack_test Change-Id: Ie1c9c91fb4f3585a7543df55a71abf64f8fc6dff --- libunwindstack/ElfInterface.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libunwindstack/ElfInterface.cpp b/libunwindstack/ElfInterface.cpp index 10afe33be..4c05a1bcc 100644 --- a/libunwindstack/ElfInterface.cpp +++ b/libunwindstack/ElfInterface.cpp @@ -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);