Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(819)

Unified Diff: src/kern.cc

Issue 512923003: Fix MSVC warnings about possible value truncation. (Closed) Base URL: https://chromium.googlesource.com/external/ots.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/hdmx.cc ('k') | src/loca.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/kern.cc
diff --git a/src/kern.cc b/src/kern.cc
index d0f0a65d946f7bd997df4d21e85804cca5b91c3e..c12d60854d0398977c61370d98d6f2feb9c78c04 100644
--- a/src/kern.cc
+++ b/src/kern.cc
@@ -111,8 +111,8 @@ bool ots_kern_parse(OpenTypeFile *file, const uint8_t *data, size_t length) {
if (subtable.entry_selector != max_pow2) {
return OTS_FAILURE();
}
- const uint32_t expected_range_shift
- = kFormat0PairSize * num_pairs - subtable.search_range;
+ const uint16_t expected_range_shift =
+ kFormat0PairSize * num_pairs - subtable.search_range;
if (subtable.range_shift != expected_range_shift) {
OTS_WARNING("bad range shift");
subtable.range_shift = expected_range_shift;
@@ -161,17 +161,21 @@ bool ots_kern_should_serialise(OpenTypeFile *file) {
bool ots_kern_serialise(OTSStream *out, OpenTypeFile *file) {
const OpenTypeKERN *kern = file->kern;
- if (!out->WriteU16(kern->version) ||
- !out->WriteU16(kern->subtables.size())) {
+ const uint16_t num_subtables = static_cast<uint16_t>(kern->subtables.size());
+ if (num_subtables != kern->subtables.size() ||
+ !out->WriteU16(kern->version) ||
+ !out->WriteU16(num_subtables)) {
return OTS_FAILURE();
}
- for (unsigned i = 0; i < kern->subtables.size(); ++i) {
- const uint16_t length = 14 + (6 * kern->subtables[i].pairs.size());
- if (!out->WriteU16(kern->subtables[i].version) ||
- !out->WriteU16(length) ||
+ for (uint16_t i = 0; i < num_subtables; ++i) {
+ const size_t length = 14 + (6 * kern->subtables[i].pairs.size());
+ if (length > std::numeric_limits<uint16_t>::max() ||
+ !out->WriteU16(kern->subtables[i].version) ||
+ !out->WriteU16(static_cast<uint16_t>(length)) ||
!out->WriteU16(kern->subtables[i].coverage) ||
- !out->WriteU16(kern->subtables[i].pairs.size()) ||
+ !out->WriteU16(
+ static_cast<uint16_t>(kern->subtables[i].pairs.size())) ||
!out->WriteU16(kern->subtables[i].search_range) ||
!out->WriteU16(kern->subtables[i].entry_selector) ||
!out->WriteU16(kern->subtables[i].range_shift)) {
« no previous file with comments | « src/hdmx.cc ('k') | src/loca.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698