commit 74eb0b592af88fa347bb8727aad6a4152aebc16e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 01 18:43:26 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 01 18:43:26 2021 +0000
tree 3eafad79877e047390d876137cb3b6bf7129c818
parent cbd78e45dd7454d540da5e021dcf7192307c6826
parent e89adb650e052b950c2d61e361fbc55a6d7005ab

Merge "Fix minor compos_key_cmd problems" am: e89adb650e

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/1907810

Change-Id: I748a6c168dd1b7a074eb04659fda22f49955cf1f

compos/compos_key_cmd/compos_key_cmd.cpp

diff --git a/compos/compos_key_cmd/compos_key_cmd.cpp b/compos/compos_key_cmd/compos_key_cmd.cpp
index c2699ab..560eb09 100644
--- a/compos/compos_key_cmd/compos_key_cmd.cpp
+++ b/compos/compos_key_cmd/compos_key_cmd.cpp
@@ -101,6 +101,10 @@
 
 void copyToLog(unique_fd&& fd) {
     FILE* source = Fdopen(std::move(fd), "r");
+    if (source == nullptr) {
+        LOG(INFO) << "Can't log VM output";
+        return;
+    }
     size_t size = 0;
     char* line = nullptr;
 
@@ -237,7 +241,7 @@
         }
 
         ScopedFileDescriptor instanceFd(
-                TEMP_FAILURE_RETRY(open(mInstanceImageFile.c_str(), O_RDONLY | O_CLOEXEC)));
+                TEMP_FAILURE_RETRY(open(mInstanceImageFile.c_str(), O_RDWR | O_CLOEXEC)));
         if (instanceFd.get() == -1) {
             return ErrnoError() << "Failed to open instance image file";
         }