security-context: avoid UB in C macro (#8229)

to safely use wl_container_of with a class the class has to be no
virtual functions, no inheritance, and uniform access control (e.g all
public)

work around this by putting this into a destroywrapper struct.
This commit is contained in:
Tom Englund 2024-10-25 12:26:48 +02:00 committed by GitHub
parent 3cec45d821
commit f0e023bff2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 7 deletions

View file

@ -37,14 +37,20 @@ class CSecurityContextManagerResource {
SP<CWpSecurityContextManagerV1> resource;
};
class CSecurityContextSandboxedClient;
struct CSecurityContextSandboxedClientDestroyWrapper {
wl_listener listener;
CSecurityContextSandboxedClient* parent = nullptr;
};
class CSecurityContextSandboxedClient {
public:
static SP<CSecurityContextSandboxedClient> create(int clientFD);
~CSecurityContextSandboxedClient();
void onDestroy();
void onDestroy();
wl_listener destroyListener;
CSecurityContextSandboxedClientDestroyWrapper destroyListener;
private:
CSecurityContextSandboxedClient(int clientFD_);
@ -81,4 +87,4 @@ class CSecurityContextProtocol : public IWaylandProtocol {
namespace PROTO {
inline UP<CSecurityContextProtocol> securityContext;
};
};