Browse files

Misc #308: Close config file after using it

Misc #308: Close the config file after using it, instead of leaving it
open forever. Thanks to SyedAmerGilani for the report.
  • Loading branch information...
1 parent d7f95b5 commit 2343e4bbd298b35ea5c190c52abd2b0cb9f79a18 @richardgv richardgv committed Sep 22, 2015
Showing with 11 additions and 6 deletions.
  1. +11 −6 src/compton.c
View
17 src/compton.c
@@ -5466,12 +5466,17 @@ parse_config(session_t *ps, struct options_tmp *pcfgtmp) {
}
#endif
- if (CONFIG_FALSE == config_read(&cfg, f)) {
- printf("Error when reading configuration file \"%s\", line %d: %s\n",
- path, config_error_line(&cfg), config_error_text(&cfg));
- config_destroy(&cfg);
- free(path);
- return;
+ {
+ int read_result = config_read(&cfg, f);
+ fclose(f);
+ f = NULL;
+ if (CONFIG_FALSE == read_result) {
+ printf("Error when reading configuration file \"%s\", line %d: %s\n",
+ path, config_error_line(&cfg), config_error_text(&cfg));
+ config_destroy(&cfg);
+ free(path);
+ return;
+ }
}
config_set_auto_convert(&cfg, 1);

0 comments on commit 2343e4b

Please sign in to comment.