commit ea0e470f6840d2aa26fa9dcf76fdcd4e6863c4ac
author Patrick Venture <venture@google.com> Mon Oct 05 12:22:59 2020 -0700
committer Patrick Venture <venture@google.com> Mon Oct 05 21:15:40 2020 +0000
tree 0a13ce7a145cc8728e15f8b02afa899b2f9676bd
parent 48474bc1d98067d15074002fc32929f488155fd6

tools: io: add ppcMemFd cleanup

The destructor may try to double-close because the ppcMemFd was not
being set to -1.

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: I3423ae874d551b39f3deb761c5572078b07a0349

tools/io.cpp

diff --git a/tools/io.cpp b/tools/io.cpp
index 991507b..9af8ace 100644
--- a/tools/io.cpp
+++ b/tools/io.cpp
@@ -94,9 +94,15 @@
 PpcMemDevice::~PpcMemDevice()
 {
     // Attempt to close in case reads or writes didn't close themselves
+    close();
+}
+
+void PpcMemDevice::close()
+{
     if (ppcMemFd >= 0)
     {
         sys->close(ppcMemFd);
+        ppcMemFd = -1;
     }
 }
 
@@ -116,11 +122,11 @@
     {
         std::fprintf(stderr, "IO read failed at offset: 0x%zx, length: %zu\n",
                      offset, length);
-        sys->close(ppcMemFd);
+        close();
         return false;
     }
 
-    sys->close(ppcMemFd);
+    close();
     return true;
 }
 
@@ -140,11 +146,11 @@
     {
         std::fprintf(stderr, "IO write failed at offset: 0x%zx, length: %zu\n",
                      offset, length);
-        sys->close(ppcMemFd);
+        close();
         return false;
     }
 
-    sys->close(ppcMemFd);
+    close();
     return true;
 }
 

tools/io.hpp

diff --git a/tools/io.hpp b/tools/io.hpp
index 1476c5c..b3b2c79 100644
--- a/tools/io.hpp
+++ b/tools/io.hpp
@@ -91,6 +91,8 @@
                const void* const source) override;
 
   private:
+    void close();
+
     int ppcMemFd = -1;
     const std::string ppcMemPath;
     const internal::Sys* sys;