| commit | 56a0811b707ab18a3868d122236cdd41cf43e1a2 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Jul 24 22:42:26 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 24 22:42:26 2024 +0000 |
| tree | 3693e4d1970520f7e03a06573a55c3d35ffdb04c | |
| parent | 345cce62b35f1dff8787629d236f255d3c7be543 [diff] | |
| parent | 752f33b8974c15993c2a86c006540a4f664d2d91 [diff] |
Merge "Make BpfRingbufBase destructor virtual" into main am: 752f33b897 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3193071 Change-Id: I104e1d144a6f7321d6bbc896d50ef2927c338080 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/staticlibs/native/bpf_headers/include/bpf/BpfRingbuf.h b/staticlibs/native/bpf_headers/include/bpf/BpfRingbuf.h index cf90d60..4bcd259 100644 --- a/staticlibs/native/bpf_headers/include/bpf/BpfRingbuf.h +++ b/staticlibs/native/bpf_headers/include/bpf/BpfRingbuf.h
@@ -34,7 +34,7 @@ // BpfRingbufBase contains the non-templated functionality of BPF ring buffers. class BpfRingbufBase { public: - ~BpfRingbufBase() { + virtual ~BpfRingbufBase() { if (mConsumerPos) munmap(mConsumerPos, mConsumerSize); if (mProducerPos) munmap(mProducerPos, mProducerSize); mConsumerPos = nullptr;