aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2019-07-11 03:52:58 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-07-11 03:52:58 +0000
commit0827cdb90de63f85c74dac694272ffeb3ff10a7a (patch)
treee6e175a2bbeb0fa794778f768867055c1ba93e90
parent914fafd798bdfc0a58adcf61bf1db22682472988 (diff)
parent448f04f0baa6c75b45c2c17595decf0f0bf16529 (diff)
downloadsfntly-0827cdb90de63f85c74dac694272ffeb3ff10a7a.tar.gz
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"android-o-mr1-iot-release-1.0.14
-rw-r--r--README.android4
-rw-r--r--cpp/src/sfntly/port/file_input_stream.cc2
2 files changed, 5 insertions, 1 deletions
diff --git a/README.android b/README.android
index 4447b27..39b0cf9 100644
--- a/README.android
+++ b/README.android
@@ -9,3 +9,7 @@ git rm -rf cpp/data
git rm -rf cpp/ext
git rm -rf cpp/tools
git commit
+
+
+# Local changes
+Fixed uninitialized variable. See bug 116114182 for details.
diff --git a/cpp/src/sfntly/port/file_input_stream.cc b/cpp/src/sfntly/port/file_input_stream.cc
index 12c1e12..d07dc34 100644
--- a/cpp/src/sfntly/port/file_input_stream.cc
+++ b/cpp/src/sfntly/port/file_input_stream.cc
@@ -74,7 +74,7 @@ int32_t FileInputStream::Read() {
#endif
return 0;
}
- uint8_t value;
+ byte_t value = 0;
size_t length = fread(&value, 1, 1, file_);
position_ += length;
return value;