cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: add a destructor to CHyprOpenglImpl and avoid wl_container_of undefined behaviour (#7101)

Browse source 
* protocols: avoid undefined behaviour in C macro

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.

* opengl: clean memory on destruction

add a destructor and free the allocated memory and close the fd
This commit is contained in:
Tom Englund 2024-07-29 19:19:47 +02:00 • committed by Vaxry
parent 60b663e276
commit 9c38b0fdbe
6 changed files with 47 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/protocols/GlobalShortcuts.hpp
View file

@ -14,6 +14,12 @@ struct SShortcutClient {
std::vector<std::unique_ptr<SShortcut>> shortcuts;
};
class CGlobalShortcutsProtocolManager;
struct CGlobalShortcutsProtocolManagerDestroyWrapper {
wl_listener listener;
CGlobalShortcutsProtocolManager* parent = nullptr;
};
class CGlobalShortcutsProtocolManager {
public:
CGlobalShortcutsProtocolManager();
@ -31,7 +37,7 @@ class CGlobalShortcutsProtocolManager {
std::vector<SShortcut> getAllShortcuts();
wl_listener m_liDisplayDestroy;
CGlobalShortcutsProtocolManagerDestroyWrapper m_liDisplayDestroy;
private:
std::vector<std::unique_ptr<SShortcutClient>> m_vClients;