[v9_9] address valgrind warnings

4059.	[bug]		Addressed valgrind warnings. [RT #38549]

diff --git a/CHANGES b/CHANGES
index e36ca09b1f23fff59d418a326f9f312bf888b623..2d45c10312c1c652c58c6fbf361f343a91a2f087 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4059.  [bug]           Addressed valgrind warnings. [RT #38549]
+
 4058.  [bug]           UDP dispatches could use the wrong psuedorandom
                        number generator context. [RT #38578]
 

diff --git a/bin/named/server.c b/bin/named/server.c
index 8dd3957e6e02cc2d18c47ce43c8785a648934b1c..84b4067bf400f4d90ba88a854d7fc5f6382035d2 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -8644,7 +8644,7 @@ ns_server_signing(ns_server_t *server, char *args, isc_buffer_t *text) {
        isc_boolean_t first = ISC_TRUE;
        isc_boolean_t list = ISC_FALSE, clear = ISC_FALSE;
        isc_boolean_t chain = ISC_FALSE;
-       char keystr[DNS_SECALG_FORMATSIZE + 7];
+       char keystr[DNS_SECALG_FORMATSIZE + 7]; /* <5-digit keyid>/<alg> */
        unsigned short hash = 0, flags = 0, iter = 0, saltlen = 0;
        unsigned char salt[255];
        const char *ptr;
@@ -8670,7 +8670,7 @@ ns_server_signing(ns_server_t *server, char *args, isc_buffer_t *text) {
                ptr = next_token(&args, " \t");
                if (ptr == NULL)
                        return (ISC_R_UNEXPECTEDEND);
-               memmove(keystr, ptr, sizeof(keystr));
+               strlcpy(keystr, ptr, sizeof(keystr));
        } else if (strcasecmp(ptr, "-nsec3param") == 0) {
                const char *hashstr, *flagstr, *iterstr;
                char nbuf[512];