Add a missing check for a pathname being too long.

[oweals/tinc.git] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 58d7b6d30e94b4975aa016ed697bf39340bcdfd7..3f81877bf405e1d4ca35491df127a86f1e947b0a 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -467,9 +467,14 @@ static void disable_old_keys(const char *filename) {
                return;
        }
 
                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)) {
 
        while(fgets(buf, sizeof(buf), r)) {
                if(!strncmp(buf, "-----BEGIN RSA", 14)) {