openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Match LZMA SDK 18.05 API." 

am: 3607fe672a

Change-Id: Ic9131a5bf07b30fc8f2986ecf3c7fa88823971f9
This commit is contained in:
Sen Jiang 2018-05-11 12:07:48 -07:00 committed by android-build-merger
parent 205cf8aefb 3607fe672a
commit b4403da532
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libunwindstack/ElfInterface.cpp
View File

@ -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);