Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdb7799b authored by Mike McTernan's avatar Mike McTernan Committed by Automerger Merge Worker
Browse files

Merge "Mark the return of munmap() as unused." into main am: 71533739 am: a98256f7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3244900



Change-Id: I9e41d70050343ab05e6ba2821f530a8eaa773ae4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34a6429e a98256f7

libs/binder/Parcel.cpp

+6 −2
Original line number Diff line number Diff line
@@ -1725,7 +1725,9 @@ status_t Parcel::writeBlob(size_t len, bool mutableCopy, WritableBlob* outBlob) 
                }

            }

        }

        ::munmap(ptr, len);

        if (::munmap(ptr, len) == -1) {

            ALOGW("munmap() failed: %s", strerror(errno));

        }

    }

    ::close(fd);

    return status;
@@ -3332,7 +3334,9 @@ Parcel::Blob::~Blob() { 


void Parcel::Blob::release() {

    if (mFd != -1 && mData) {

        ::munmap(mData, mSize);

        if (::munmap(mData, mSize) == -1) {

            ALOGW("munmap() failed: %s", strerror(errno));

        }

    }

    clear();

}