Snap for 9157512 from d2c589e358e3913846c246271811f4d1bf1fec73 to mainline-tzdata3-release
Change-Id: Id2d956ff3835c875e0a7734c86f9ba64e2fc3667
diff --git a/common/libs/utils/files.cpp b/common/libs/utils/files.cpp
index ea84b32..f3a6eab 100644
--- a/common/libs/utils/files.cpp
+++ b/common/libs/utils/files.cpp
@@ -147,6 +147,10 @@
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());