zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix resource leaks dealing with unrecognised config file version 

Plug leaks of an open file descriptor and dynamically allocated
'option' when we bail out early reading unknown config version.
This commit is contained in:
Nathan Scott 2021-08-31 15:55:27 +10:00 committed by BenBE
parent 1f2f567ca1
commit b81bb9038c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Settings.c
View File

@ -182,6 +182,8 @@ static bool Settings_read(Settings* this, const char* fileName, unsigned int ini
// the version of the config file on disk is newer than what we can read // the version of the config file on disk is newer than what we can read
fprintf(stderr, "WARNING: %s specifies configuration format version v%d, but this %s binary supports up to v%d.", fileName, this->config_version, PACKAGE, CONFIG_READER_MIN_VERSION); fprintf(stderr, "WARNING: %s specifies configuration format version v%d, but this %s binary supports up to v%d.", fileName, this->config_version, PACKAGE, CONFIG_READER_MIN_VERSION);
fprintf(stderr, " The configuration version will be downgraded to v%d when %s exits.\n", CONFIG_READER_MIN_VERSION, PACKAGE); fprintf(stderr, " The configuration version will be downgraded to v%d when %s exits.\n", CONFIG_READER_MIN_VERSION, PACKAGE);
String_freeArray(option);
fclose(fd);
return false; return false;
} }
} else if (String_eq(option[0], "fields")) { } else if (String_eq(option[0], "fields")) {