diff options
| author | Xin Li <delphij@google.com> | 2019-07-01 20:59:35 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2019-07-01 20:59:35 +0000 |
| commit | a8967929fa3bee7d9165c4bcd065864117f69a3b (patch) | |
| tree | b640e267e012edad57653de6f16797a03b9f3bb3 | |
| parent | 3403333ae2a2802540275eaa63f223ad3fb9e223 (diff) | |
| parent | 18749cd7ca092ec364714e468892ecca208464a6 (diff) | |
| download | sfntly-a8967929fa3bee7d9165c4bcd065864117f69a3b.tar.gz | |
DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
Bug: 134405016
Change-Id: I5b6cef149f883367f9238225239033f5c34e476b
| -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; |