}
void free_config(config_t *cfg) {
- if(cfg->variable) {
- free(cfg->variable);
- }
-
- if(cfg->value) {
- free(cfg->value);
- }
-
- if(cfg->file) {
- free(cfg->file);
- }
-
+ free(cfg->variable);
+ free(cfg->value);
+ free(cfg->file);
free(cfg);
}
}
bool get_config_subnet(const config_t *cfg, subnet_t **result) {
- subnet_t subnet = {};
+ subnet_t subnet = {0};
if(!cfg) {
return false;
// And we try to read the ones that end with ".conf"
if(l > 5 && !strcmp(".conf", & ep->d_name[ l - 5 ])) {
- if(snprintf(fname, sizeof(fname), "%s/%s", dname, ep->d_name) >= sizeof(fname)) {
+ if((size_t)snprintf(fname, sizeof(fname), "%s/%s", dname, ep->d_name) >= sizeof(fname)) {
logger(LOG_ERR, "Pathname too long: %s/%s", dname, ep->d_name);
return false;
}
return;
}
- snprintf(tmpfile, sizeof(tmpfile), "%s.tmp", filename);
+ int len = snprintf(tmpfile, sizeof(tmpfile), "%s.tmp", filename);
- w = fopen(tmpfile, "w");
+ if(len < 0 || len >= PATH_MAX) {
+ fprintf(stderr, "Pathname too long: %s.tmp\n", filename);
+ w = NULL;
+ } else {
+ w = fopen(tmpfile, "w");
+ }
while(fgets(buf, sizeof(buf), r)) {
if(!strncmp(buf, "-----BEGIN RSA", 14)) {
/* The directory is a relative path or a filename. */
getcwd(directory, sizeof(directory));
- if(snprintf(abspath, sizeof(abspath), "%s/%s", directory, fn) >= sizeof(abspath)) {
+ if((size_t)snprintf(abspath, sizeof(abspath), "%s/%s", directory, fn) >= sizeof(abspath)) {
fprintf(stderr, "Pathname too long: %s/%s\n", directory, fn);
return NULL;
}