Fix ANSI string botch, allocate space for NUL on ASCII string

diff --git a/confpars.c b/confpars.c
index 902b70833fe4cf117ae15e3d3ae93d89af61eb4c..9b924238999f3662fdceb37b18ad4158968e743b 100644 (file)
--- a/confpars.c
+++ b/confpars.c
@@ -466,7 +466,7 @@ void parse_shared_net_statement (cfile, bc)
                parse_warn ("zero-length shared network name");
                val = "<no-name-given>";
        }
-       name = dmalloc (strlen (val), "parse_shared_net_statement");
+       name = dmalloc (strlen (val) + 1, "parse_shared_net_statement");
        if (!name)
                error ("no memory for shared network name");
        strcpy (name, val);
@@ -951,7 +951,7 @@ void parse_option_decl (cfile, bc, options)
                                                 tree_const (val,
                                                             strlen (val)));
                                } else {
-                                       parse_warn ("expecting string %s."
+                                       parse_warn ("expecting string %s.",
                                                    "or hexadecimal data");
                                        skip_to_semi (cfile);
                                        longjmp (jdref (bc), 1);

diff --git a/server/confpars.c b/server/confpars.c
index 902b70833fe4cf117ae15e3d3ae93d89af61eb4c..9b924238999f3662fdceb37b18ad4158968e743b 100644 (file)
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -466,7 +466,7 @@ void parse_shared_net_statement (cfile, bc)
                parse_warn ("zero-length shared network name");
                val = "<no-name-given>";
        }
-       name = dmalloc (strlen (val), "parse_shared_net_statement");
+       name = dmalloc (strlen (val) + 1, "parse_shared_net_statement");
        if (!name)
                error ("no memory for shared network name");
        strcpy (name, val);
@@ -951,7 +951,7 @@ void parse_option_decl (cfile, bc, options)
                                                 tree_const (val,
                                                             strlen (val)));
                                } else {
-                                       parse_warn ("expecting string %s."
+                                       parse_warn ("expecting string %s.",
                                                    "or hexadecimal data");
                                        skip_to_semi (cfile);
                                        longjmp (jdref (bc), 1);