Skip to content

Commit 20ca48c

Browse files
authored
Merge pull request #3768 from deprekated/fix_privacy_null_deref
fix null-deref due to unconstructed PrivacyNodeInfo
2 parents b863627 + 86ce9f7 commit 20ca48c

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/util/pipewire/pipewire_backend.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ void PipewireBackend::handleRegistryEventGlobal(uint32_t id, uint32_t permission
126126
if (proxy == nullptr) return;
127127

128128
auto *pNodeInfo = (PrivacyNodeInfo *)pw_proxy_get_user_data(proxy);
129+
new(pNodeInfo) PrivacyNodeInfo{};
129130
pNodeInfo->id = id;
130131
pNodeInfo->data = this;
131132
pNodeInfo->type = mediaType;
@@ -142,6 +143,7 @@ void PipewireBackend::handleRegistryEventGlobalRemove(uint32_t id) {
142143
mutex_.lock();
143144
auto iter = privacy_nodes.find(id);
144145
if (iter != privacy_nodes.end()) {
146+
privacy_nodes[id]->~PrivacyNodeInfo();
145147
privacy_nodes.erase(id);
146148
}
147149
mutex_.unlock();

0 commit comments

Comments
 (0)