Snap for 9157512 from d2c589e358e3913846c246271811f4d1bf1fec73 to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010

Change-Id: Id2d956ff3835c875e0a7734c86f9ba64e2fc3667

1 files changed, 4 insertions, 0 deletions

diff --git a/common/libs/utils/files.cpp b/common/libs/utils/files.cpp
index ea84b3221..f3a6eabf3 100644
--- a/common/libs/utils/files.cpp
+++ b/common/libs/utils/files.cpp
@@ -147,6 +147,10 @@ std::string ReadFile(const std::string& file) {
   std::string contents;
   std::ifstream in(file, std::ios::in | std::ios::binary);
   in.seekg(0, std::ios::end);
+  if (in.fail()) {
+    // TODO(schuffelen): Return a failing Result instead
+    return "";
+  }
   contents.resize(in.tellg());
   in.seekg(0, std::ios::beg);
   in.read(&contents[0], contents.size());