commit 3607fe672a1aa0fa775df01b60d18d287e7f8686
author Sen Jiang <senj@google.com> Fri May 11 18:58:58 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 11 18:58:58 2018 +0000
tree b8bc771b972f99a3b8585261964fb52c4cf251f7
parent 7ea8047185a85c3c1d8f329587b87eee109c670f
parent 2ef03e0f010f280695d2e3c509ab48eee33ba959

Merge "Match LZMA SDK 18.05 API."

libunwindstack/ElfInterface.cpp

diff --git a/libunwindstack/ElfInterface.cpp b/libunwindstack/ElfInterface.cpp
index 10afe33..4c05a1b 100644
--- a/libunwindstack/ElfInterface.cpp
+++ b/libunwindstack/ElfInterface.cpp
@@ -87,8 +87,8 @@
 
   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 @@
       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);