Zander671/Waybar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3768 from deprekated/fix_privacy_null_deref

Browse Source 
fix null-deref due to unconstructed PrivacyNodeInfo
This commit is contained in:
Alexis Rouillard
2024-11-20 09:02:38 +01:00
committed by GitHub
parent b863627c22 86ce9f7278
commit 20ca48c3b8
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/util/pipewire/pipewire_backend.cpp
View File

@ -126,6 +126,7 @@ void PipewireBackend::handleRegistryEventGlobal(uint32_t id, uint32_t permission
if (proxy == nullptr) return; if (proxy == nullptr) return;
auto *pNodeInfo = (PrivacyNodeInfo *)pw_proxy_get_user_data(proxy); auto *pNodeInfo = (PrivacyNodeInfo *)pw_proxy_get_user_data(proxy);
new(pNodeInfo) PrivacyNodeInfo{};
pNodeInfo->id = id; pNodeInfo->id = id;
pNodeInfo->data = this; pNodeInfo->data = this;
pNodeInfo->type = mediaType; pNodeInfo->type = mediaType;
@ -142,6 +143,7 @@ void PipewireBackend::handleRegistryEventGlobalRemove(uint32_t id) {
mutex_.lock(); mutex_.lock();
auto iter = privacy_nodes.find(id); auto iter = privacy_nodes.find(id);
if (iter != privacy_nodes.end()) { if (iter != privacy_nodes.end()) {
privacy_nodes[id]->~PrivacyNodeInfo();
privacy_nodes.erase(id); privacy_nodes.erase(id);
} }
mutex_.unlock(); mutex_.unlock();