Add a missing check for a pathname being too long.

[tinc] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 0388799..3f81877 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -81,18 +81,9 @@ config_t *new_config(void) {
 }
 
 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);
 }
 
@@ -476,9 +467,14 @@ static void disable_old_keys(const char *filename) {
                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)) {