[Openvpn-devel] [PATCH] Detect config lines that are too long and give a warning/error

[Arne Schwabe]

This closes Trac ticket 631
---
 src/openvpn/options.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 4347525..be4ba52 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -3798,7 +3798,7 @@ read_config_file (struct options *options,
   const int max_recursive_levels = 10;
   FILE *fp;
   int line_num;
-  char line[OPTION_LINE_SIZE];
+  char line[OPTION_LINE_SIZE+1];
   char *p[MAX_PARMS];

   ++level;
@@ -3816,6 +3816,10 @@ read_config_file (struct options *options,
               int offset = 0;
              CLEAR (p);
              ++line_num;
+          if (strlen(line) == OPTION_LINE_SIZE)
+              msg (msglevel, "In %s:%d: Maximum optione line length (%d) 
exceeded, line starts with %s",
+                   file, line_num, OPTION_LINE_SIZE, line);
+
               /* Ignore UTF-8 BOM at start of stream */
               if (line_num == 1 && strncmp (line, "\xEF\xBB\xBF", 3) == 0)
                 offset = 3;
-- 
2.5.4 (Apple Git-61)