diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-14 04:59:43 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-05-14 04:59:43 +0000 |
| commit | ae2f2db5e0e961441be3545878b1c3be7de1f1c5 (patch) | |
| tree | 5a317d80317cd5b3b88baeeeabc8aaf78107f3e7 | |
| parent | 0bad802dc17fc283171923479960d6dab6342d3c (diff) | |
| parent | 505d1d117865ee5261b91c3555c0c71a757e5cf3 (diff) | |
| download | sfntly-ae2f2db5e0e961441be3545878b1c3be7de1f1c5.tar.gz | |
Merge cherrypicks of [7496339, 7495273, 7495624, 7496340, 7496341, 7496342, 7496343, 7495658, 7494789, 7494790, 7494791, 7496344, 7496345, 7496346, 7496347, 7496574, 7496348, 7496575, 7496576, 7496260, 7496349, 7496350, 7496440, 7496577, 7496578, 7496261, 7495625, 7496442, 7496351] into pi-qpr3-releaseandroid-9.0.0_r46android-9.0.0_r44android-9.0.0_r43pie-qpr3-release
Change-Id: I0ddc03a2113226a4e86a84370ef36345c2afd3e5
| -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 dfe9a7b..883c1fd 100644 --- a/cpp/src/sfntly/port/file_input_stream.cc +++ b/cpp/src/sfntly/port/file_input_stream.cc @@ -70,7 +70,7 @@ int32_t FileInputStream::Read() { #endif return 0; } - byte_t value; + byte_t value = 0; size_t length = fread(&value, 1, 1, file_); position_ += length; return value; |