diff options
| author | Haibo Huang <hhb@google.com> | 2019-05-09 10:04:49 -0700 |
|---|---|---|
| committer | Haibo Huang <hhb@google.com> | 2019-05-09 17:06:35 +0000 |
| commit | 9d076a5b2421c911b6ea377187df3a9b0d80eb32 (patch) | |
| tree | 16c17827e4a299056727b41a8b53d0564d02418d | |
| parent | 34d4937c06c78ff8352fcb7aaec5b9da153b2f7c (diff) | |
| parent | adc5927a693a03e8710ea4bb627f81855fe81ab2 (diff) | |
| download | sfntly-9d076a5b2421c911b6ea377187df3a9b0d80eb32.tar.gz | |
resolve merge conflicts of adc5927a693a03e8710ea4bb627f81855fe81ab2 to qt-dev-plus-aosp
Bug: 116114182
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: Solve merge conflicts
Change-Id: I079c392a848a687cf74a7063d47c4dc3fbd0486c
| -rw-r--r-- | README.android | 4 | ||||
| -rw-r--r-- | cpp/src/sfntly/port/file_input_stream.cc | 2 |
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..87b7c8c 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; + uint8_t value = 0; size_t length = fread(&value, 1, 1, file_); position_ += length; return value; |