Merge the 2019-08-01 SPL branch from AOSP-Partner
* security-aosp-nyc-mr2-release:
Fix uninitialized value in sfntly
Change-Id: Iaeb67c983b0cbc5d3f4eccd076bbb70189900e3b
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/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 @@
#endif
return 0;
}
- byte_t value;
+ byte_t value = 0;
size_t length = fread(&value, 1, 1, file_);
position_ += length;
return value;