github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-21 22:13:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some Double Free and uninitialized Memory in Switch

Browse source
This commit is contained in:
Florian Märkl 2021-01-12 12:59:04 +01:00
commit 0b6e479e0b
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
3 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
switch/include/discoverymanager.h
View file

@ -24,7 +24,7 @@ class DiscoveryManager
struct sockaddr * host_addr = nullptr; struct sockaddr * host_addr = nullptr;
size_t host_addr_len = 0; size_t host_addr_len = 0;
uint32_t GetIPv4BroadcastAddr(); uint32_t GetIPv4BroadcastAddr();
bool service_enable; bool service_enable = false;
public: public:
typedef enum hoststate typedef enum hoststate

6
switch/src/discoverymanager.cpp
View file

@ -35,19 +35,13 @@ DiscoveryManager::~DiscoveryManager()
{ {
// join discovery thread // join discovery thread
if(this->service_enable) if(this->service_enable)
{
SetService(false); SetService(false);
}
chiaki_discovery_fini(&this->discovery);
} }
void DiscoveryManager::SetService(bool enable) void DiscoveryManager::SetService(bool enable)
{ {
if(this->service_enable == enable) if(this->service_enable == enable)
{
return; return;
}
this->service_enable = enable; this->service_enable = enable;

7
switch/src/main.cpp
View file

@ -129,8 +129,11 @@ int main(int argc, char *argv[])
// build sdl OpenGl and AV decoders graphical interface // build sdl OpenGl and AV decoders graphical interface
DiscoveryManager discoverymanager = DiscoveryManager(); DiscoveryManager discoverymanager = DiscoveryManager();
MainApplication app = MainApplication(&discoverymanager); {
app.Load(); // scope to delete MainApplication before SDL_Quit()
MainApplication app(&discoverymanager);
app.Load();
}
CHIAKI_LOGI(log, "Quit applet"); CHIAKI_LOGI(log, "Quit applet");
SDL_Quit(); SDL_Quit();