summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yurii Zubrytskyi <zyy@google.com> 2021-03-18 19:29:19 -0700
committer Songchun Fan <schfan@google.com> 2021-03-19 04:26:32 +0000
commitf5a6fb9996387ff2feb0c77545c2f883998065a7 (patch)
tree6f3043815a3897bc5b47ca4078ecb513008cef39
parent4375a7453574a219f446222409a567acb2d60120 (diff)
[incfs] Fix the unsafe memory copy in IncrementalService
Better to protect the memcpy() and zero-out the target Bug: 183160959 Test: atest IncrementalService Change-Id: I3daca749168a8c5a32b1eedc7992006cbe2e9eb4
-rw-r--r--services/incremental/BinderIncrementalService.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/incremental/BinderIncrementalService.cpp b/services/incremental/BinderIncrementalService.cpp
index 9869b075b36f..5e5be2506567 100644
--- a/services/incremental/BinderIncrementalService.cpp
+++ b/services/incremental/BinderIncrementalService.cpp
@@ -280,8 +280,8 @@ binder::Status BinderIncrementalService::getMetadataByPath(int32_t storageId,
}
static FileId toFileId(const std::vector<uint8_t>& id) {
- FileId fid;
- memcpy(&fid, id.data(), id.size());
+ FileId fid = {};
+ memcpy(&fid, id.data(), std::min(sizeof(fid), id.size()));
return fid;
}