commit 8a9c30e35dc6fea05021a720546f0e34f18bfd22
author David Anderson <dvander@google.com> Wed Dec 05 12:07:14 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 05 12:07:14 2018 -0800
tree c4e85a6de27f2a693340e86e582bc74254c59fdb
parent 13a009b5de3f7505ce62926fe55a72c3a52775cb
parent 53f852fdde23532e6f423c7de4d8c8b9df8afabb

Merge "fastboot: Check if super_empty.img exists before reading it." am: dbbbb17c1d am: d8e8f71a20
am: 3e389f2894

Change-Id: Ie853f7acda50974c9854d92d1abfc1417ef179cd

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index fee0857..b717aef 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1541,7 +1541,7 @@
         return false;
     }
     auto path = find_item_given_name("super_empty.img");
-    if (path.empty()) {
+    if (path.empty() || access(path.c_str(), R_OK)) {
         return false;
     }
     auto metadata = android::fs_mgr::ReadFromImageFile(path);