Miroirs/sway-patched-tray-menu
1
0
Fork 0
mirror of https://github.com/NickHu/sway synced 2024-12-27 21:58:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add error handling for getting config file size

Browse source
This commit is contained in:
Ian Fan 2018-07-15 15:36:51 +01:00
parent e6209afcd6
commit 011d43746f
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sway/config.c
View file

@ -561,12 +561,17 @@ static char *expand_line(const char *block, const char *line, bool add_brace) {
bool read_config(FILE *file, struct sway_config *config) { bool read_config(FILE *file, struct sway_config *config) {
bool reading_main_config = false; bool reading_main_config = false;
char *this_config = NULL; char *this_config = NULL;
unsigned long config_size = 0; size_t config_size = 0;
if (config->current_config == NULL) { if (config->current_config == NULL) {
reading_main_config = true; reading_main_config = true;
fseek(file, 0, SEEK_END); int ret_seek = fseek(file, 0, SEEK_END);
config_size = ftell(file); long ret_tell = ftell(file);
if (ret_seek == -1 || ret_tell == -1) {
wlr_log(WLR_ERROR, "Unable to get size of config file");
return false;
}
config_size = ret_tell;
rewind(file); rewind(file);
config->current_config = this_config = calloc(1, config_size + 1); config->current_config = this_config = calloc(1, config_size + 1);