commit cd925cd6deb2506902772d9fd30cf77f65ef58d4
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 05 02:42:47 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 05 02:42:47 2019 +0000
tree c60d47b45b6983eddaac574d046f66e1632d7e90
parent c724003a00f2abd8a6111e87a77eab7b1de16a94
parent 96477f7550d755f1fa76c5484aa5e7eee16e5d5d

Merge "Open image files in binary mode" into qt-dev

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 827db96..f8f7eb3 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1407,7 +1407,7 @@
 
 int LocalImageSource::OpenFile(const std::string& name) const {
     auto path = find_item_given_name(name);
-    return open(path.c_str(), O_RDONLY);
+    return open(path.c_str(), O_RDONLY | O_BINARY);
 }
 
 static void do_flashall(const std::string& slot_override, bool skip_secondary, bool wipe) {