commit 9a3dbd00cbc1c65608f2146f04ab23d480f6cd53
author Maciej Żenczykowski <maze@google.com> Fri Apr 24 16:40:41 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 24 16:40:41 2020 +0000
tree f1e8f6566e3c00ed6c9f49cfb52e816801fca1e7
parent 7867df4aa94538da295daeebc9048970f1bcee22
parent 54a7e769ae9976690f7eb56731f87a0574540412

BpfMap.h - fix cert-oop54-cpp compiler warning am: 54a7e769ae

Change-Id: I8bc6b3265062d197fe4761ba069610d64c2603d0

libbpf_android/include/bpf/BpfMap.h

diff --git a/libbpf_android/include/bpf/BpfMap.h b/libbpf_android/include/bpf/BpfMap.h
index 8c35931..c92f989 100644
--- a/libbpf_android/include/bpf/BpfMap.h
+++ b/libbpf_android/include/bpf/BpfMap.h
@@ -129,8 +129,9 @@
     const base::unique_fd& getMap() const { return mMapFd; };
 
     // Copy assignment operator
-    void operator=(const BpfMap<Key, Value>& other) {
-        mMapFd.reset(fcntl(other.mMapFd.get(), F_DUPFD_CLOEXEC, 0));
+    BpfMap<Key, Value>& operator=(const BpfMap<Key, Value>& other) {
+        if (this != &other) mMapFd.reset(fcntl(other.mMapFd.get(), F_DUPFD_CLOEXEC, 0));
+        return *this;
     }
 
     // Move constructor