diff options
| author | Etienne Pierre-doray <etiennep@chromium.org> | 2018-09-10 16:19:33 +0000 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2021-07-25 20:36:14 -0700 |
| commit | 725a8734514bb88b5acd976040e6710e26b2e3b5 (patch) | |
| tree | 15293dbea03b652c5873d1aaebbc2efaf67c88c3 /zucchini_apply.cc | |
| parent | 74d44edc92e96d45c2f1d488e42171bb3c55570c (diff) | |
| download | zucchini-725a8734514bb88b5acd976040e6710e26b2e3b5.tar.gz | |
[Zucchini]: Fix OffsetMapper implicit conversion.
Fix compile error with -Wshorten-64-to-32. Image size is new stored as an
offset_t to avoid implicit conversion.
Bug: 881008
Change-Id: I82b12ce17d8368f05d6a5537fd1734ee32b37dbe
Reviewed-on: https://chromium-review.googlesource.com/1213549
Reviewed-by: Samuel Huang <huangs@chromium.org>
Commit-Queue: Etienne Pierre-Doray <etiennep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589938}
NOKEYCHECK=True
GitOrigin-RevId: 5946dbfa3f684d8f4960bb413b5e8322ebddcee3
Diffstat (limited to 'zucchini_apply.cc')
| -rw-r--r-- | zucchini_apply.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/zucchini_apply.cc b/zucchini_apply.cc index e202085..2d001a1 100644 --- a/zucchini_apply.cc +++ b/zucchini_apply.cc @@ -10,6 +10,7 @@ #include <utility> #include "base/logging.h" +#include "base/numerics/safe_conversions.h" #include "components/zucchini/disassembler.h" #include "components/zucchini/element_detection.h" #include "components/zucchini/equivalence_map.h" @@ -112,8 +113,9 @@ bool ApplyReferencesCorrection(ExecutableType exe_type, for (const auto& ref_group : old_disasm->MakeReferenceGroups()) pool_groups[ref_group.pool_tag()].push_back(ref_group); - OffsetMapper offset_mapper(patch.GetEquivalenceSource(), old_image.size(), - new_image.size()); + OffsetMapper offset_mapper(patch.GetEquivalenceSource(), + base::checked_cast<offset_t>(old_image.size()), + base::checked_cast<offset_t>(new_image.size())); std::vector<ReferenceGroup> new_groups = new_disasm->MakeReferenceGroups(); for (const auto& pool_and_sub_groups : pool_groups) { |