commit e2e9d546df5b6f43fc35cca19a3523e498088f5b
author Zijun Zhao <zijunzhao@google.com> Thu May 18 23:46:06 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 18 23:46:06 2023 +0000
tree 974f370a8784cf419a847baa27101d9edd5f7648
parent a06d545510ba839735e4500b1b4f55d153305e7b
parent e43d0d0159494220aa67bf47eff45788b52987d6

Merge "Fix -Wnullable-to-nonnull-conversion error"

libs/binder/MemoryHeapBase.cpp

diff --git a/libs/binder/MemoryHeapBase.cpp b/libs/binder/MemoryHeapBase.cpp
index 8fe1d2b..3da06ba 100644
--- a/libs/binder/MemoryHeapBase.cpp
+++ b/libs/binder/MemoryHeapBase.cpp
@@ -78,7 +78,7 @@
         if (SEAL_FLAGS && (fcntl(fd, F_ADD_SEALS, SEAL_FLAGS) == -1)) {
             ALOGE("MemoryHeapBase: MemFD %s sealing with flags %x failed with error  %s", name,
                   SEAL_FLAGS, strerror(errno));
-            munmap(mBase, mSize);
+            if (mNeedUnmap) munmap(mBase, mSize);
             mBase = nullptr;
             mSize = 0;
             close(fd);