diff options
author | Nathan Scott <nathans@redhat.com> | 2021-11-05 09:13:13 +1100 |
---|---|---|
committer | Nathan Scott <nathans@redhat.com> | 2021-12-07 17:04:49 +1100 |
commit | 0e58784224ede880e6201d23d3b280e378ccefb8 (patch) | |
tree | 4fad22f13a35a5c66652cf5ad1ceeb71c9eb4cdb /Settings.c | |
parent | 4ef5e4296ed183a2e1cc75925ea813467634c558 (diff) |
Fix memory leak on shutdown in new screen settings code.
Also tidy up the calloc call parameters in the initial allocation
of this pointer, thanks to @BenBE for noticing.
Diffstat (limited to 'Settings.c')
-rw-r--r-- | Settings.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -77,6 +77,7 @@ void Settings_delete(Settings* this) { for (unsigned int i = 0; this->screens[i]; i++) { free(this->screens[i]->name); free(this->screens[i]->fields); + free(this->screens[i]); } free(this->screens); } @@ -262,7 +263,7 @@ static void ScreenSettings_readFields(ScreenSettings* ss, Hashtable* columns, co } ScreenSettings* Settings_newScreen(Settings* this, const char* name, const char* line) { - ScreenSettings* ss = xCalloc(sizeof(ScreenSettings), 1); + ScreenSettings* ss = xCalloc(1, sizeof(ScreenSettings)); ss->name = xStrdup(name); ss->fields = xCalloc(LAST_PROCESSFIELD, sizeof(ProcessField)); ss->flags = 0; |