]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
[v9_6] replace memcpy() with memmove().
authorEvan Hunt <each@isc.org>
Thu, 9 Jan 2014 00:38:15 +0000 (16:38 -0800)
committerEvan Hunt <each@isc.org>
Thu, 9 Jan 2014 00:41:01 +0000 (16:41 -0800)
3698. [cleanup] Replaced all uses of memcpy() with memmove().
[RT #35120]

(cherry picked from commit ebe54c7d2221c6a0a4b3d96bcae3280c823a45e6)
(cherry picked from commit 9b950c70f1a6406c0f3dff604822329d06fc4837)
(cherry picked from commit ae5f27d8856436d01f19c958d1a4afe8dc2bedb0)

108 files changed:
CHANGES
bin/dig/dighost.c
bin/dnssec/dnssec-signzone.c
bin/named/builtin.c
bin/named/config.c
bin/named/controlconf.c
bin/named/lwaddr.c
bin/named/lwdgnba.c
bin/named/lwdgrbn.c
bin/named/query.c
bin/named/update.c
bin/nsupdate/nsupdate.c
bin/rndc/rndc-confgen.c
bin/rndc/rndc.c
bin/tests/hash_test.c
bin/tests/names/t_names.c
bin/tests/rdata_test.c
lib/bind9/check.c
lib/dns/acl.c
lib/dns/adb.c
lib/dns/diff.c
lib/dns/dispatch.c
lib/dns/dnssec.c
lib/dns/gssapi_link.c
lib/dns/hmac_link.c
lib/dns/journal.c
lib/dns/masterdump.c
lib/dns/message.c
lib/dns/name.c
lib/dns/nsec.c
lib/dns/nsec3.c
lib/dns/opensslrsa_link.c
lib/dns/portlist.c
lib/dns/rbt.c
lib/dns/rbtdb.c
lib/dns/rcode.c
lib/dns/rdata.c
lib/dns/rdata/ch_3/a_1.c
lib/dns/rdata/generic/afsdb_18.c
lib/dns/rdata/generic/eui48_108.c
lib/dns/rdata/generic/eui64_109.c
lib/dns/rdata/generic/ipseckey_45.c
lib/dns/rdata/generic/l32_105.c
lib/dns/rdata/generic/l64_106.c
lib/dns/rdata/generic/nid_104.c
lib/dns/rdata/generic/opt_41.c
lib/dns/rdata/generic/rt_21.c
lib/dns/rdata/generic/soa_6.c
lib/dns/rdata/generic/spf_99.c
lib/dns/rdata/generic/txt_16.c
lib/dns/rdata/hs_4/a_1.c
lib/dns/rdata/in_1/a6_38.c
lib/dns/rdata/in_1/a_1.c
lib/dns/rdata/in_1/aaaa_28.c
lib/dns/rdata/in_1/apl_42.c
lib/dns/rdata/in_1/wks_11.c
lib/dns/rdataslab.c
lib/dns/resolver.c
lib/dns/spnego.c
lib/dns/ssu.c
lib/dns/time.c
lib/dns/tkey.c
lib/dns/tsig.c
lib/dns/ttl.c
lib/dns/zone.c
lib/isc/base32.c
lib/isc/base64.c
lib/isc/buffer.c
lib/isc/hash.c
lib/isc/heap.c
lib/isc/hex.c
lib/isc/hmacmd5.c
lib/isc/hmacsha.c
lib/isc/include/isc/buffer.h
lib/isc/include/isc/radix.h
lib/isc/inet_pton.c
lib/isc/lex.c
lib/isc/log.c
lib/isc/md5.c
lib/isc/mem.c
lib/isc/netaddr.c
lib/isc/radix.c
lib/isc/sha1.c
lib/isc/sha2.c
lib/isc/sockaddr.c
lib/isc/stats.c
lib/isc/string.c
lib/isc/tests/hash_test.c
lib/isc/unix/file.c
lib/isc/unix/ifiter_getifaddrs.c
lib/isc/unix/ifiter_ioctl.c
lib/isc/unix/ifiter_sysctl.c
lib/isc/unix/interfaceiter.c
lib/isc/unix/socket.c
lib/isc/win32/interfaceiter.c
lib/isc/win32/socket.c
lib/isccc/include/isccc/util.h
lib/isccc/sexpr.c
lib/isccfg/parser.c
lib/lwres/context.c
lib/lwres/getaddrinfo.c
lib/lwres/gethost.c
lib/lwres/getipnode.c
lib/lwres/getrrset.c
lib/lwres/lwbuffer.c
lib/lwres/lwconfig.c
lib/lwres/lwinetpton.c
lib/lwres/lwresutil.c

diff --git a/CHANGES b/CHANGES
index 3beed5d60fb35138344258976a213504499a40e5..9ef678b740569274ecdc5bc09d60f56c3d696c6c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3698.  [cleanup]       Replaced all uses of memcpy() with memmove().
+                       [RT #35120]
+
 3697.  [bug]           Handle "." as a search list element when IDN support
                        is enabled. [RT #35133]
 
index a2e9052daa348b5df93496b834468fbc65459276..8efea81a0ec6350fbdf22aaefb9cf8c4f9b21bd9 100644 (file)
@@ -424,7 +424,7 @@ static isc_result_t
 append(const char *text, int len, char **p, char *end) {
        if (len > end - *p)
                return (ISC_R_NOSPACE);
-       memcpy(*p, text, len);
+       memmove(*p, text, len);
        *p += len;
        return (ISC_R_SUCCESS);
 }
@@ -3761,7 +3761,7 @@ output_filter(isc_buffer_t *buffer, unsigned int used_org,
        fromlen = isc_buffer_usedlength(buffer) - used_org;
        if (fromlen >= MAXDLEN)
                return (ISC_R_SUCCESS);
-       memcpy(tmp1, (char *)isc_buffer_base(buffer) + used_org, fromlen);
+       memmove(tmp1, (char *)isc_buffer_base(buffer) + used_org, fromlen);
        end_with_dot = (tmp1[fromlen - 1] == '.') ? ISC_TRUE : ISC_FALSE;
        if (absolute && !end_with_dot) {
                fromlen++;
@@ -3790,7 +3790,7 @@ output_filter(isc_buffer_t *buffer, unsigned int used_org,
                return (ISC_R_NOSPACE);
 
        isc_buffer_subtract(buffer, isc_buffer_usedlength(buffer) - used_org);
-       memcpy(isc_buffer_used(buffer), tmp1, tolen);
+       memmove(isc_buffer_used(buffer), tmp1, tolen);
        isc_buffer_add(buffer, tolen);
 
        return (ISC_R_SUCCESS);
index d017dca71c73366c512065f41fcd7588cd3c4bd6..884b1e10c1298856b747a446f721273e2a5eb22d 100644 (file)
@@ -645,7 +645,7 @@ hashlist_add(hashlist_t *l, const unsigned char *hash, size_t len)
                        fatal("unable to grow hashlist: out of memory");
        }
        memset(l->hashbuf + l->entries * l->length, 0, l->length);
-       memcpy(l->hashbuf + l->entries * l->length, hash, len);
+       memmove(l->hashbuf + l->entries * l->length, hash, len);
        l->entries++;
 }
 
@@ -1559,7 +1559,8 @@ verifyzone(void) {
                        fatal("no self signing keys found");
                fprintf(stderr, "No self signing KSK found. Using self signed "
                        "ZSK's for active algorithm list.\n");
-               memcpy(ksk_algorithms, self_algorithms, sizeof(ksk_algorithms));
+               memmove(ksk_algorithms, self_algorithms,
+                       sizeof(ksk_algorithms));
                if (!allzsksigned)
                        fprintf(stderr, "warning: not all ZSK's are self "
                                "signed.\n");
index 7c397d49b5c828664fa3a7d7ce60147d125d2c54..0ab7058adcf1c8603549ca4f6c2ee272a2201492 100644 (file)
@@ -89,7 +89,7 @@ put_txt(dns_sdblookup_t *lookup, const char *text) {
        if (len > 255)
                len = 255; /* Silently truncate */
        buf[0] = len;
-       memcpy(&buf[1], text, len);
+       memmove(&buf[1], text, len);
        return (dns_sdb_putrdata(lookup, dns_rdatatype_txt, 0, buf, len + 1));
 }
 
@@ -257,7 +257,7 @@ builtin_create(const char *zone, int argc, char **argv,
                        if (empty != NULL)
                                isc_mem_put(ns_g_mctx, empty, sizeof (*empty));
                } else {
-                       memcpy(empty, &empty_builtin, sizeof (empty_builtin));
+                       memmove(empty, &empty_builtin, sizeof (empty_builtin));
                        empty->server = server;
                        empty->contact = contact;
                        *dbdata = empty;
index 6e2efa9f75d53fb388422a0ef7182232f4615e4f..4e7a1659aac6183604ff2db38d7ff48243f49ab6 100644 (file)
@@ -517,7 +517,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list,
                                if (new == NULL)
                                        goto cleanup;
                                if (listcount != 0) {
-                                       memcpy(new, lists, oldsize);
+                                       memmove(new, lists, oldsize);
                                        isc_mem_put(mctx, lists, oldsize);
                                }
                                lists = new;
@@ -552,7 +552,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list,
                                if (new == NULL)
                                        goto cleanup;
                                if (stackcount != 0) {
-                                       memcpy(new, stack, oldsize);
+                                       memmove(new, stack, oldsize);
                                        isc_mem_put(mctx, stack, oldsize);
                                }
                                stack = new;
@@ -579,7 +579,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list,
                        if (new == NULL)
                                goto cleanup;
                        if (addrcount != 0) {
-                               memcpy(new, addrs, oldsize);
+                               memmove(new, addrs, oldsize);
                                isc_mem_put(mctx, addrs, oldsize);
                        }
                        addrs = new;
@@ -591,7 +591,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list,
                        if (new == NULL)
                                goto cleanup;
                        if (keycount != 0) {
-                               memcpy(new, keys, oldsize);
+                               memmove(new, keys, oldsize);
                                isc_mem_put(mctx, keys, oldsize);
                        }
                        keys = new;
@@ -639,7 +639,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list,
                        new = isc_mem_get(mctx, newsize);
                        if (new == NULL)
                                goto cleanup;
-                       memcpy(new, addrs, newsize);
+                       memmove(new, addrs, newsize);
                } else
                        new = NULL;
                isc_mem_put(mctx, addrs, oldsize);
@@ -652,7 +652,7 @@ ns_config_getipandkeylist(const cfg_obj_t *config, const cfg_obj_t *list,
                        new = isc_mem_get(mctx, newsize);
                        if (new == NULL)
                                goto cleanup;
-                       memcpy(new, keys,  newsize);
+                       memmove(new, keys,  newsize);
                } else
                        new = NULL;
                isc_mem_put(mctx, keys, oldsize);
index 7da6ae3c809c857944d0047a77fa8429e7ef10a6..7613c111c6f728e269ee3cd602dec74d23fb654f 100644 (file)
@@ -367,7 +367,7 @@ control_recvmessage(isc_task_t *task, isc_event_t *event) {
                secret.rstart = isc_mem_get(listener->mctx, key->secret.length);
                if (secret.rstart == NULL)
                        goto cleanup;
-               memcpy(secret.rstart, key->secret.base, key->secret.length);
+               memmove(secret.rstart, key->secret.base, key->secret.length);
                secret.rend = secret.rstart + key->secret.length;
                result = isccc_cc_fromwire(&ccregion, &request, &secret);
                if (result == ISC_R_SUCCESS)
@@ -784,8 +784,8 @@ register_keys(const cfg_obj_t *control, const cfg_obj_t *keylist,
                                free_controlkey(keyid, mctx);
                                break;
                        }
-                       memcpy(keyid->secret.base, isc_buffer_base(&b),
-                              keyid->secret.length);
+                       memmove(keyid->secret.base, isc_buffer_base(&b),
+                               keyid->secret.length);
                }
        }
 }
@@ -864,8 +864,8 @@ get_rndckey(isc_mem_t *mctx, controlkeylist_t *keyids) {
                           "out of memory", keyid->keyname);
                CHECK(ISC_R_NOMEMORY);
        }
-       memcpy(keyid->secret.base, isc_buffer_base(&b),
-              keyid->secret.length);
+       memmove(keyid->secret.base, isc_buffer_base(&b),
+               keyid->secret.length);
        ISC_LIST_APPEND(*keyids, keyid, link);
        keyid = NULL;
        result = ISC_R_SUCCESS;
index ed7880ac26828448acf80ced68007a1b614c73ed..ed93b6982cfc8e83c5accaf2a5ad9cefac601188 100644 (file)
@@ -41,11 +41,11 @@ lwaddr_netaddr_fromlwresaddr(isc_netaddr_t *na, lwres_addr_t *la) {
 
        if (la->family == LWRES_ADDRTYPE_V4) {
                struct in_addr ina;
-               memcpy(&ina.s_addr, la->address, 4);
+               memmove(&ina.s_addr, la->address, 4);
                isc_netaddr_fromin(na, &ina);
        } else {
                struct in6_addr ina6;
-               memcpy(&ina6.s6_addr, la->address, 16);
+               memmove(&ina6.s6_addr, la->address, 16);
                isc_netaddr_fromin6(na, &ina6);
        }
        return (ISC_R_SUCCESS);
@@ -77,11 +77,11 @@ lwaddr_lwresaddr_fromnetaddr(lwres_addr_t *la, isc_netaddr_t *na) {
        if (na->family == AF_INET) {
                la->family = LWRES_ADDRTYPE_V4;
                la->length = 4;
-               memcpy(la->address, &na->type.in, 4);
+               memmove(la->address, &na->type.in, 4);
        } else {
                la->family = LWRES_ADDRTYPE_V6;
                la->length = 16;
-               memcpy(la->address, &na->type.in6, 16);
+               memmove(la->address, &na->type.in6, 16);
        }
        return (ISC_R_SUCCESS);
 }
index dfc2ad65439974c93ecb72894f516c3faf18ca9a..f5b303302676e8f58777db4ef7a43d140b26552c 100644 (file)
@@ -226,12 +226,12 @@ ns_lwdclient_processgnba(ns_lwdclient_t *client, lwres_buffer_t *b) {
                client->na.family = AF_INET;
                if (req->addr.length != 4)
                        goto out;
-               memcpy(&client->na.type.in, req->addr.address, 4);
+               memmove(&client->na.type.in, req->addr.address, 4);
        } else if (req->addr.family == LWRES_ADDRTYPE_V6) {
                client->na.family = AF_INET6;
                if (req->addr.length != 16)
                        goto out;
-               memcpy(&client->na.type.in6, req->addr.address, 16);
+               memmove(&client->na.type.in6, req->addr.address, 16);
        } else {
                goto out;
        }
index f31923ba2cb68d078ad48494fd90e355f29558a6..f469302a72041515a6cfa108b022314cc1d8495a 100644 (file)
@@ -124,8 +124,8 @@ iterate_node(lwres_grbnresponse_t *grbn, dns_db_t *db, dns_dbnode_t *node,
                        lens = isc_mem_get(mctx, size * sizeof(*lens));
                        if (lens == NULL)
                                goto out;
-                       memcpy(rdatas, oldrdatas, used * sizeof(*rdatas));
-                       memcpy(lens, oldlens, used * sizeof(*lens));
+                       memmove(rdatas, oldrdatas, used * sizeof(*rdatas));
+                       memmove(lens, oldlens, used * sizeof(*lens));
                        isc_mem_put(mctx, oldrdatas,
                                    oldsize * sizeof(*oldrdatas));
                        isc_mem_put(mctx, oldlens, oldsize * sizeof(*oldlens));
@@ -158,8 +158,8 @@ iterate_node(lwres_grbnresponse_t *grbn, dns_db_t *db, dns_dbnode_t *node,
                newlens = isc_mem_get(mctx, used * sizeof(*lens));
                if (newlens == NULL)
                        goto out;
-               memcpy(newrdatas, rdatas, used * sizeof(*rdatas));
-               memcpy(newlens, lens, used * sizeof(*lens));
+               memmove(newrdatas, rdatas, used * sizeof(*rdatas));
+               memmove(newlens, lens, used * sizeof(*lens));
                isc_mem_put(mctx, rdatas, size * sizeof(*rdatas));
                isc_mem_put(mctx, lens, size * sizeof(*lens));
                grbn->rdatas = newrdatas;
index 5b5b9a89ee0d3749382e9a5f996dd96f2ecab455..b80e3fa6e5fe74d71711b72a145ebf0cdd7f9c76 100644 (file)
@@ -3401,12 +3401,12 @@ rdata_tonetaddr(const dns_rdata_t *rdata, isc_netaddr_t *netaddr) {
        switch (rdata->type) {
        case dns_rdatatype_a:
                INSIST(rdata->length == 4);
-               memcpy(&ina.s_addr, rdata->data, 4);
+               memmove(&ina.s_addr, rdata->data, 4);
                isc_netaddr_fromin(netaddr, &ina);
                return (ISC_R_SUCCESS);
        case dns_rdatatype_aaaa:
                INSIST(rdata->length == 16);
-               memcpy(in6a.s6_addr, rdata->data, 16);
+               memmove(in6a.s6_addr, rdata->data, 16);
                isc_netaddr_fromin6(netaddr, &in6a);
                return (ISC_R_SUCCESS);
        default:
index f3fcc48261a2b5836a22cd5973c7a7cea86a6a6a..7fccca1ec4d6123703a6f8f885687c3ad878e580 100644 (file)
@@ -3138,7 +3138,7 @@ add_nsec3param_records(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
                         */
                        dns_rdata_clone(&tuple->rdata, &rdata);
                        INSIST(rdata.length <= sizeof(buf));
-                       memcpy(buf, rdata.data, rdata.length);
+                       memmove(buf, rdata.data, rdata.length);
                        buf[1] |= DNS_NSEC3FLAG_CREATE;
                        buf[1] &= ~DNS_NSEC3FLAG_UPDATE;
                        rdata.data = buf;
@@ -3215,7 +3215,7 @@ add_nsec3param_records(ns_client_t *client, dns_zone_t *zone, dns_db_t *db,
                 */
                dns_rdata_clone(&tuple->rdata, &rdata);
                INSIST(rdata.length <= sizeof(buf));
-               memcpy(buf, rdata.data, rdata.length);
+               memmove(buf, rdata.data, rdata.length);
                buf[1] |= DNS_NSEC3FLAG_REMOVE;
                rdata.data = buf;
 
@@ -3420,7 +3420,7 @@ delete_chains(dns_db_t *db, dns_dbversion_t *ver, dns_name_t *origin,
             result = dns_rdataset_next(&rdataset)) {
                dns_rdataset_current(&rdataset, &rdata);
                INSIST(rdata.length <= sizeof(buf));
-               memcpy(buf, rdata.data, rdata.length);
+               memmove(buf, rdata.data, rdata.length);
 
                if (buf[1] == (DNS_NSEC3FLAG_REMOVE | DNS_NSEC3FLAG_NONSEC)) {
                        dns_rdata_reset(&rdata);
@@ -3858,7 +3858,7 @@ update_action(isc_task_t *task, isc_event_t *event) {
                                 * Set the NSEC3CHAIN creation flag.
                                 */
                                INSIST(rdata.length <= sizeof(buf));
-                               memcpy(buf, rdata.data, rdata.length);
+                               memmove(buf, rdata.data, rdata.length);
                                buf[1] |= DNS_NSEC3FLAG_UPDATE;
                                rdata.data = buf;
                                /*
index bb2029df26c71a9b2aa1b4ae6a7874020c4464c4..3489536e86c98057707ec453bec087bb1521799f 100644 (file)
@@ -755,13 +755,17 @@ setup_system(void) {
                if (servers == NULL)
                        fatal("out of memory");
                for (i = 0; i < ns_total; i++) {
-                       if (lwconf->nameservers[i].family == LWRES_ADDRTYPE_V4) {
+                       if (lwconf->nameservers[i].family == LWRES_ADDRTYPE_V4)
+                       {
                                struct in_addr in4;
-                               memcpy(&in4, lwconf->nameservers[i].address, 4);
-                               isc_sockaddr_fromin(&servers[i], &in4, DNSDEFAULTPORT);
+                               memmove(&in4,
+                                       lwconf->nameservers[i].address, 4);
+                               isc_sockaddr_fromin(&servers[i], &in4,
+                                                   DNSDEFAULTPORT);
                        } else {
                                struct in6_addr in6;
-                               memcpy(&in6, lwconf->nameservers[i].address, 16);
+                               memmove(&in6,
+                                       lwconf->nameservers[i].address, 16);
                                isc_sockaddr_fromin6(&servers[i], &in6,
                                                     DNSDEFAULTPORT);
                        }
@@ -2374,7 +2378,7 @@ start_gssrequest(dns_name_t *master)
        if (userserver == NULL)
                get_address(namestr, DNSDEFAULTPORT, kserver);
        else
-               (void)memcpy(kserver, userserver, sizeof(isc_sockaddr_t));
+               (void)memmove(kserver, userserver, sizeof(isc_sockaddr_t));
 
        dns_fixedname_init(&fname);
        servname = dns_fixedname_name(&fname);
index f2478d0e6b4a415e99a7af691400d7b4638ed80e..eda78490612eddcc9677c9a698ada3a5bb2ea1c9 100644 (file)
@@ -155,7 +155,7 @@ main(int argc, char **argv) {
 
        result = isc_file_progname(*argv, program, sizeof(program));
        if (result != ISC_R_SUCCESS)
-               memcpy(program, "rndc-confgen", 13);
+               memmove(program, "rndc-confgen", 13);
        progname = program;
 
        keyname = DEFAULT_KEYNAME;
index 2c7697e574144e1bcbae30d4a0d316e5d3cfc2a3..5e2296995696634f6bf6f9f53ac84f0d6872e3a1 100644 (file)
@@ -688,7 +688,7 @@ main(int argc, char **argv) {
 
        result = isc_file_progname(*argv, program, sizeof(program));
        if (result != ISC_R_SUCCESS)
-               memcpy(program, "rndc", 5);
+               memmove(program, "rndc", 5);
        progname = program;
 
        admin_conffile = RNDC_CONFFILE;
@@ -820,7 +820,7 @@ main(int argc, char **argv) {
        p = args;
        for (i = 0; i < argc; i++) {
                size_t len = strlen(argv[i]);
-               memcpy(p, argv[i], len);
+               memmove(p, argv[i], len);
                p += len;
                *p++ = ' ';
        }
index 73d397b010cb1227b7c20f98652e69dfa661f77d..980b4bc3bd4ec2f76a92e086e29fc4dae9d54102 100644 (file)
@@ -66,35 +66,35 @@ main(int argc, char **argv) {
 
        s = "abc";
        isc_sha1_init(&sha1);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_sha1_update(&sha1, buffer, strlen(s));
        isc_sha1_final(&sha1, digest);
        print_digest(s, "sha1", digest, ISC_SHA1_DIGESTLENGTH/4);
 
        s = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
        isc_sha1_init(&sha1);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_sha1_update(&sha1, buffer, strlen(s));
        isc_sha1_final(&sha1, digest);
        print_digest(s, "sha1", digest, ISC_SHA1_DIGESTLENGTH/4);
 
        s = "abc";
        isc_sha224_init(&sha224);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_sha224_update(&sha224, buffer, strlen(s));
        isc_sha224_final(digest, &sha224);
        print_digest(s, "sha224", digest, ISC_SHA224_DIGESTLENGTH/4);
 
        s = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq";
        isc_sha224_init(&sha224);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_sha224_update(&sha224, buffer, strlen(s));
        isc_sha224_final(digest, &sha224);
        print_digest(s, "sha224", digest, ISC_SHA224_DIGESTLENGTH/4);
 
        s = "abc";
        isc_md5_init(&md5);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_md5_update(&md5, buffer, strlen(s));
        isc_md5_final(&md5, digest);
        print_digest(s, "md5", digest, 4);
@@ -105,7 +105,7 @@ main(int argc, char **argv) {
        s = "Hi There";
        memset(key, 0x0b, 16);
        isc_hmacmd5_init(&hmacmd5, key, 16);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacmd5_update(&hmacmd5, buffer, strlen(s));
        isc_hmacmd5_sign(&hmacmd5, digest);
        print_digest(s, "hmacmd5", digest, 4);
@@ -113,7 +113,7 @@ main(int argc, char **argv) {
        s = "what do ya want for nothing?";
        strcpy((char *)key, "Jefe");
        isc_hmacmd5_init(&hmacmd5, key, 4);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacmd5_update(&hmacmd5, buffer, strlen(s));
        isc_hmacmd5_sign(&hmacmd5, digest);
        print_digest(s, "hmacmd5", digest, 4);
@@ -125,7 +125,7 @@ main(int argc, char **argv) {
            "\335\335\335\335\335\335\335\335\335\335";
        memset(key, 0xaa, 16);
        isc_hmacmd5_init(&hmacmd5, key, 16);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacmd5_update(&hmacmd5, buffer, strlen(s));
        isc_hmacmd5_sign(&hmacmd5, digest);
        print_digest(s, "hmacmd5", digest, 4);
@@ -136,7 +136,7 @@ main(int argc, char **argv) {
        s = "Hi There";
        memset(key, 0x0b, 20);
        isc_hmacsha1_init(&hmacsha1, key, 20);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacsha1_update(&hmacsha1, buffer, strlen(s));
        isc_hmacsha1_sign(&hmacsha1, digest, ISC_SHA1_DIGESTLENGTH);
        print_digest(s, "hmacsha1", digest, ISC_SHA1_DIGESTLENGTH/4);
@@ -144,7 +144,7 @@ main(int argc, char **argv) {
        s = "what do ya want for nothing?";
        strcpy((char *)key, "Jefe");
        isc_hmacsha1_init(&hmacsha1, key, 4);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacsha1_update(&hmacsha1, buffer, strlen(s));
        isc_hmacsha1_sign(&hmacsha1, digest, ISC_SHA1_DIGESTLENGTH);
        print_digest(s, "hmacsha1", digest, ISC_SHA1_DIGESTLENGTH/4);
@@ -156,7 +156,7 @@ main(int argc, char **argv) {
            "\335\335\335\335\335\335\335\335\335\335";
        memset(key, 0xaa, 20);
        isc_hmacsha1_init(&hmacsha1, key, 20);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacsha1_update(&hmacsha1, buffer, strlen(s));
        isc_hmacsha1_sign(&hmacsha1, digest, ISC_SHA1_DIGESTLENGTH);
        print_digest(s, "hmacsha1", digest, ISC_SHA1_DIGESTLENGTH/4);
@@ -167,7 +167,7 @@ main(int argc, char **argv) {
        s = "Hi There";
        memset(key, 0x0b, 20);
        isc_hmacsha224_init(&hmacsha224, key, 20);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacsha224_update(&hmacsha224, buffer, strlen(s));
        isc_hmacsha224_sign(&hmacsha224, digest, ISC_SHA224_DIGESTLENGTH);
        print_digest(s, "hmacsha224", digest, ISC_SHA224_DIGESTLENGTH/4);
@@ -175,7 +175,7 @@ main(int argc, char **argv) {
        s = "what do ya want for nothing?";
        strcpy((char *)key, "Jefe");
        isc_hmacsha224_init(&hmacsha224, key, 4);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacsha224_update(&hmacsha224, buffer, strlen(s));
        isc_hmacsha224_sign(&hmacsha224, digest, ISC_SHA224_DIGESTLENGTH);
        print_digest(s, "hmacsha224", digest, ISC_SHA224_DIGESTLENGTH/4);
@@ -187,7 +187,7 @@ main(int argc, char **argv) {
            "\335\335\335\335\335\335\335\335\335\335";
        memset(key, 0xaa, 20);
        isc_hmacsha224_init(&hmacsha224, key, 20);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacsha224_update(&hmacsha224, buffer, strlen(s));
        isc_hmacsha224_sign(&hmacsha224, digest, ISC_SHA224_DIGESTLENGTH);
        print_digest(s, "hmacsha224", digest, ISC_SHA224_DIGESTLENGTH/4);
@@ -198,7 +198,7 @@ main(int argc, char **argv) {
        s = "Hi There";
        memset(key, 0x0b, 20);
        isc_hmacsha256_init(&hmacsha256, key, 20);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacsha256_update(&hmacsha256, buffer, strlen(s));
        isc_hmacsha256_sign(&hmacsha256, digest, ISC_SHA256_DIGESTLENGTH);
        print_digest(s, "hmacsha256", digest, ISC_SHA256_DIGESTLENGTH/4);
@@ -206,7 +206,7 @@ main(int argc, char **argv) {
        s = "what do ya want for nothing?";
        strcpy((char *)key, "Jefe");
        isc_hmacsha256_init(&hmacsha256, key, 4);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacsha256_update(&hmacsha256, buffer, strlen(s));
        isc_hmacsha256_sign(&hmacsha256, digest, ISC_SHA256_DIGESTLENGTH);
        print_digest(s, "hmacsha256", digest, ISC_SHA256_DIGESTLENGTH/4);
@@ -218,7 +218,7 @@ main(int argc, char **argv) {
            "\335\335\335\335\335\335\335\335\335\335";
        memset(key, 0xaa, 20);
        isc_hmacsha256_init(&hmacsha256, key, 20);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacsha256_update(&hmacsha256, buffer, strlen(s));
        isc_hmacsha256_sign(&hmacsha256, digest, ISC_SHA256_DIGESTLENGTH);
        print_digest(s, "hmacsha256", digest, ISC_SHA256_DIGESTLENGTH/4);
@@ -229,7 +229,7 @@ main(int argc, char **argv) {
        s = "Hi There";
        memset(key, 0x0b, 20);
        isc_hmacsha384_init(&hmacsha384, key, 20);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacsha384_update(&hmacsha384, buffer, strlen(s));
        isc_hmacsha384_sign(&hmacsha384, digest, ISC_SHA384_DIGESTLENGTH);
        print_digest(s, "hmacsha384", digest, ISC_SHA384_DIGESTLENGTH/4);
@@ -237,7 +237,7 @@ main(int argc, char **argv) {
        s = "what do ya want for nothing?";
        strcpy((char *)key, "Jefe");
        isc_hmacsha384_init(&hmacsha384, key, 4);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacsha384_update(&hmacsha384, buffer, strlen(s));
        isc_hmacsha384_sign(&hmacsha384, digest, ISC_SHA384_DIGESTLENGTH);
        print_digest(s, "hmacsha384", digest, ISC_SHA384_DIGESTLENGTH/4);
@@ -249,7 +249,7 @@ main(int argc, char **argv) {
            "\335\335\335\335\335\335\335\335\335\335";
        memset(key, 0xaa, 20);
        isc_hmacsha384_init(&hmacsha384, key, 20);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacsha384_update(&hmacsha384, buffer, strlen(s));
        isc_hmacsha384_sign(&hmacsha384, digest, ISC_SHA384_DIGESTLENGTH);
        print_digest(s, "hmacsha384", digest, ISC_SHA384_DIGESTLENGTH/4);
@@ -260,7 +260,7 @@ main(int argc, char **argv) {
        s = "Hi There";
        memset(key, 0x0b, 20);
        isc_hmacsha512_init(&hmacsha512, key, 20);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacsha512_update(&hmacsha512, buffer, strlen(s));
        isc_hmacsha512_sign(&hmacsha512, digest, ISC_SHA512_DIGESTLENGTH);
        print_digest(s, "hmacsha512", digest, ISC_SHA512_DIGESTLENGTH/4);
@@ -268,7 +268,7 @@ main(int argc, char **argv) {
        s = "what do ya want for nothing?";
        strcpy((char *)key, "Jefe");
        isc_hmacsha512_init(&hmacsha512, key, 4);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacsha512_update(&hmacsha512, buffer, strlen(s));
        isc_hmacsha512_sign(&hmacsha512, digest, ISC_SHA512_DIGESTLENGTH);
        print_digest(s, "hmacsha512", digest, ISC_SHA512_DIGESTLENGTH/4);
@@ -280,7 +280,7 @@ main(int argc, char **argv) {
            "\335\335\335\335\335\335\335\335\335\335";
        memset(key, 0xaa, 20);
        isc_hmacsha512_init(&hmacsha512, key, 20);
-       memcpy(buffer, s, strlen(s));
+       memmove(buffer, s, strlen(s));
        isc_hmacsha512_update(&hmacsha512, buffer, strlen(s));
        isc_hmacsha512_sign(&hmacsha512, digest, ISC_SHA512_DIGESTLENGTH);
        print_digest(s, "hmacsha512", digest, ISC_SHA512_DIGESTLENGTH/4);
index a68f1d72367bf06b60c5fa300b3ae0044ce5d1e4..1d23374e30505e54235cb12fe6958b167f58a7ac 100644 (file)
@@ -296,7 +296,7 @@ hname_to_tname(char *src, char *target, size_t len) {
                 */
                if (srclen >= len)
                        return (1);
-               memcpy(target, src, srclen + 1);
+               memmove(target, src, srclen + 1);
                return (0);
        }
 
index f13b3d19c9aa4d6c168274102be6e659c2fc3184..a1c92c4964c16396ee2548a8ae23729efbbf1063 100644 (file)
@@ -1191,7 +1191,7 @@ main(int argc, char *argv[]) {
                dns_rdata_init(&last);
                region.base = malloc(region.length = rdata.length);
                if (region.base) {
-                       memcpy(region.base, rdata.data, rdata.length);
+                       memmove(region.base, rdata.data, rdata.length);
                        dns_rdata_fromregion(&last, class, type, &region);
                        lasttype = type;
                        first = 0;
index d3e51350c4e745e35c09f368a14dab0b5a33027a..cc6c07c5bf2ad7ed9324c96a3cfc0b25268f9bfa 100644 (file)
@@ -911,7 +911,7 @@ validate_masters(const cfg_obj_t *obj, const cfg_obj_t *config,
                                void *ptr;
 
                                DE_CONST(stack, ptr);
-                               memcpy(new, stack, oldsize);
+                               memmove(new, stack, oldsize);
                                isc_mem_put(mctx, ptr, oldsize);
                        }
                        stack = new;
index ed08942278610de9f33270c58b97f6f04753e8f9..596453732f79fad2c1bad0260d9ce4e85e998a19 100644 (file)
@@ -287,8 +287,8 @@ dns_acl_merge(dns_acl_t *dest, dns_acl_t *source, isc_boolean_t pos)
                        return (ISC_R_NOMEMORY);
 
                /* Copy in the original elements */
-               memcpy(newmem, dest->elements,
-                      dest->length * sizeof(dns_aclelement_t));
+               memmove(newmem, dest->elements,
+                       dest->length * sizeof(dns_aclelement_t));
 
                /* Release the memory for the old elements array */
                isc_mem_put(dest->mctx, dest->elements,
index 0c2095e3b7a3c7d3589071db45d85ed43860acda..1817eff7abb12cf3ccf0b16a53268b65524689e4 100644 (file)
@@ -528,12 +528,12 @@ import_rdataset(dns_adbname_t *adbname, dns_rdataset_t *rdataset,
                dns_rdataset_current(rdataset, &rdata);
                if (rdtype == dns_rdatatype_a) {
                        INSIST(rdata.length == 4);
-                       memcpy(&ina.s_addr, rdata.data, 4);
+                       memmove(&ina.s_addr, rdata.data, 4);
                        isc_sockaddr_fromin(&sockaddr, &ina, 0);
                        hookhead = &adbname->v4;
                } else {
                        INSIST(rdata.length == 16);
-                       memcpy(in6a.s6_addr, rdata.data, 16);
+                       memmove(in6a.s6_addr, rdata.data, 16);
                        isc_sockaddr_fromin6(&sockaddr, &in6a, 0);
                        hookhead = &adbname->v6;
                }
index 146dcb02709409e2e6f6130b84045edd367d5423..6d3e23230382c71c570307b2445139f1dfdd7074 100644 (file)
@@ -78,7 +78,7 @@ dns_difftuple_create(isc_mem_t *mctx,
 
        datap = (unsigned char *)(t + 1);
 
-       memcpy(datap, name->ndata, name->length);
+       memmove(datap, name->ndata, name->length);
        dns_name_init(&t->name, NULL);
        dns_name_clone(name, &t->name);
        t->name.ndata = datap;
@@ -86,7 +86,7 @@ dns_difftuple_create(isc_mem_t *mctx,
 
        t->ttl = ttl;
 
-       memcpy(datap, rdata->data, rdata->length);
+       memmove(datap, rdata->data, rdata->length);
        dns_rdata_init(&t->rdata);
        dns_rdata_clone(rdata, &t->rdata);
        t->rdata.data = datap;
index 10dd0f4b68f5beb915563796b2ebbda9dca4b496..069286ec6f77c59ef4146b37734280b3cc22b643 100644 (file)
@@ -3447,7 +3447,7 @@ dns_dispatch_importrecv(dns_dispatch_t *disp, isc_event_t *event) {
                isc_event_free(ISC_EVENT_PTR(&newsevent));
                return;
        }
-       memcpy(buf, sevent->region.base, sevent->n);
+       memmove(buf, sevent->region.base, sevent->n);
        newsevent->region.base = buf;
        newsevent->region.length = disp->mgr->buffersize;
        newsevent->n = sevent->n;
index f74cf7e9cfa0dc627b716582d28630ec722b5c21..bb5baf6c8d56c5c7dc9d094a9ea0d3e07e16f14d 100644 (file)
@@ -293,7 +293,7 @@ dns_dnssec_sign(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
         * Create an envelope for each rdata: <name|type|class|ttl>.
         */
        isc_buffer_init(&envbuf, data, sizeof(data));
-       memcpy(data, r.base, r.length);
+       memmove(data, r.base, r.length);
        isc_buffer_add(&envbuf, r.length);
        isc_buffer_putuint16(&envbuf, set->type);
        isc_buffer_putuint16(&envbuf, set->rdclass);
@@ -490,10 +490,10 @@ dns_dnssec_verify2(dns_name_t *name, dns_rdataset_t *set, dst_key_t *key,
        if (labels - sig.labels > 0) {
                isc_buffer_putuint8(&envbuf, 1);
                isc_buffer_putuint8(&envbuf, '*');
-               memcpy(data + 2, r.base, r.length);
+               memmove(data + 2, r.base, r.length);
        }
        else
-               memcpy(data, r.base, r.length);
+               memmove(data, r.base, r.length);
        isc_buffer_add(&envbuf, r.length);
        isc_buffer_putuint16(&envbuf, set->type);
        isc_buffer_putuint16(&envbuf, set->rdclass);
@@ -908,14 +908,14 @@ dns_dnssec_verifymessage(isc_buffer_t *source, dns_message_t *msg,
        /*
         * Extract the header.
         */
-       memcpy(header, source_r.base, DNS_MESSAGE_HEADERLEN);
+       memmove(header, source_r.base, DNS_MESSAGE_HEADERLEN);
 
        /*
         * Decrement the additional field counter.
         */
-       memcpy(&addcount, &header[DNS_MESSAGE_HEADERLEN - 2], 2);
+       memmove(&addcount, &header[DNS_MESSAGE_HEADERLEN - 2], 2);
        addcount = htons((isc_uint16_t)(ntohs(addcount) - 1));
-       memcpy(&header[DNS_MESSAGE_HEADERLEN - 2], &addcount, 2);
+       memmove(&header[DNS_MESSAGE_HEADERLEN - 2], &addcount, 2);
 
        /*
         * Digest the modified header.
index 063399dc5185ed606d56278bbc7177e321b427d0..856fd89274460d8cf4e0b43c34c1dcfe3572c237 100644 (file)
@@ -209,7 +209,7 @@ gssapi_verify(dst_context_t *dctx, const isc_region_t *sig) {
        buf = isc_mem_allocate(dst__memory_pool, sig->length);
        if (buf == NULL)
                return (ISC_R_FAILURE);
-       memcpy(buf, sig->base, sig->length);
+       memmove(buf, sig->base, sig->length);
        r.base = buf;
        r.length = sig->length;
        REGION_TO_GBUFFER(r, gsig);
index 2265f87442bd73f7ab873bb54e22c8303bbd5fab..cfe58dbb2158a67b8b0cbcf598383e62c9d259dd 100644 (file)
@@ -229,9 +229,8 @@ hmacmd5_fromdns(dst_key_t *key, isc_buffer_t *data) {
                isc_md5_update(&md5ctx, r.base, r.length);
                isc_md5_final(&md5ctx, hkey->key);
                keylen = ISC_MD5_DIGESTLENGTH;
-       }
-       else {
-               memcpy(hkey->key, r.base, r.length);
+       } else {
+               memmove(hkey->key, r.base, r.length);
                keylen = r.length;
        }
 
@@ -498,9 +497,8 @@ hmacsha1_fromdns(dst_key_t *key, isc_buffer_t *data) {
                isc_sha1_update(&sha1ctx, r.base, r.length);
                isc_sha1_final(&sha1ctx, hkey->key);
                keylen = ISC_SHA1_DIGESTLENGTH;
-       }
-       else {
-               memcpy(hkey->key, r.base, r.length);
+       } else {
+               memmove(hkey->key, r.base, r.length);
                keylen = r.length;
        }
 
@@ -768,9 +766,8 @@ hmacsha224_fromdns(dst_key_t *key, isc_buffer_t *data) {
                isc_sha224_update(&sha224ctx, r.base, r.length);
                isc_sha224_final(hkey->key, &sha224ctx);
                keylen = ISC_SHA224_DIGESTLENGTH;
-       }
-       else {
-               memcpy(hkey->key, r.base, r.length);
+       } else {
+               memmove(hkey->key, r.base, r.length);
                keylen = r.length;
        }
 
@@ -1038,9 +1035,8 @@ hmacsha256_fromdns(dst_key_t *key, isc_buffer_t *data) {
                isc_sha256_update(&sha256ctx, r.base, r.length);
                isc_sha256_final(hkey->key, &sha256ctx);
                keylen = ISC_SHA256_DIGESTLENGTH;
-       }
-       else {
-               memcpy(hkey->key, r.base, r.length);
+       } else {
+               memmove(hkey->key, r.base, r.length);
                keylen = r.length;
        }
 
@@ -1308,9 +1304,8 @@ hmacsha384_fromdns(dst_key_t *key, isc_buffer_t *data) {
                isc_sha384_update(&sha384ctx, r.base, r.length);
                isc_sha384_final(hkey->key, &sha384ctx);
                keylen = ISC_SHA384_DIGESTLENGTH;
-       }
-       else {
-               memcpy(hkey->key, r.base, r.length);
+       } else {
+               memmove(hkey->key, r.base, r.length);
                keylen = r.length;
        }
 
@@ -1578,9 +1573,8 @@ hmacsha512_fromdns(dst_key_t *key, isc_buffer_t *data) {
                isc_sha512_update(&sha512ctx, r.base, r.length);
                isc_sha512_final(hkey->key, &sha512ctx);
                keylen = ISC_SHA512_DIGESTLENGTH;
-       }
-       else {
-               memcpy(hkey->key, r.base, r.length);
+       } else {
+               memmove(hkey->key, r.base, r.length);
                keylen = r.length;
        }
 
index 4d53209bc37ee6ecc53e60c9a8e8545616cdd37e..e021a5ab994bad4b539a0cbfe8702dc217fea8c7 100644 (file)
@@ -349,7 +349,7 @@ journal_pos_encode(journal_rawpos_t *raw, journal_pos_t *cooked) {
 static void
 journal_header_decode(journal_rawheader_t *raw, journal_header_t *cooked) {
        INSIST(sizeof(cooked->format) == sizeof(raw->h.format));
-       memcpy(cooked->format, raw->h.format, sizeof(cooked->format));
+       memmove(cooked->format, raw->h.format, sizeof(cooked->format));
        journal_pos_decode(&raw->h.begin, &cooked->begin);
        journal_pos_decode(&raw->h.end, &cooked->end);
        cooked->index_size = decode_uint32(raw->h.index_size);
@@ -359,7 +359,7 @@ static void
 journal_header_encode(journal_header_t *cooked, journal_rawheader_t *raw) {
        INSIST(sizeof(cooked->format) == sizeof(raw->h.format));
        memset(raw->pad, 0, sizeof(raw->pad));
-       memcpy(raw->h.format, cooked->format, sizeof(raw->h.format));
+       memmove(raw->h.format, cooked->format, sizeof(raw->h.format));
        journal_pos_encode(&raw->h.begin, &cooked->begin);
        journal_pos_encode(&raw->h.end, &cooked->end);
        encode_uint32(cooked->index_size, raw->h.index_size);
@@ -512,7 +512,7 @@ journal_file_create(isc_mem_t *mctx, const char *filename) {
                return (ISC_R_NOMEMORY);
        }
        memset(mem, 0, size);
-       memcpy(mem, &rawheader, sizeof(rawheader));
+       memmove(mem, &rawheader, sizeof(rawheader));
 
        result = isc_stdio_write(mem, 1, (size_t) size, fp, NULL);
        if (result != ISC_R_SUCCESS) {
index a218ed319488fbec6ea1ce1bd211d22109b441b5..be78b8d4cf6163562599dba6437618a63f2346ec 100644 (file)
@@ -226,7 +226,7 @@ indent(unsigned int *current, unsigned int to, int tabwidth,
                        int n = t;
                        if (n > N_TABS)
                                n = N_TABS;
-                       memcpy(p, tabs, n);
+                       memmove(p, tabs, n);
                        p += n;
                        t -= n;
                }
@@ -247,7 +247,7 @@ indent(unsigned int *current, unsigned int to, int tabwidth,
                int n = t;
                if (n > N_SPACES)
                        n = N_SPACES;
-               memcpy(p, spaces, n);
+               memmove(p, spaces, n);
                p += n;
                t -= n;
        }
@@ -337,7 +337,7 @@ str_totext(const char *source, isc_buffer_t *target) {
        if (l > region.length)
                return (ISC_R_NOSPACE);
 
-       memcpy(region.base, source, l);
+       memmove(region.base, source, l);
        isc_buffer_add(target, l);
        return (ISC_R_SUCCESS);
 }
@@ -454,7 +454,7 @@ rdataset_totext(dns_rdataset_t *rdataset,
                        isc_buffer_availableregion(target, &r);
                        if (r.length < length)
                                return (ISC_R_NOSPACE);
-                       memcpy(r.base, ttlbuf, length);
+                       memmove(r.base, ttlbuf, length);
                        isc_buffer_add(target, length);
                        column += length;
 
index 849f0fdc155fae705b283fb0a5eacbcc460e28a7..af4e1154f5b168fb081890bb2bb03e3287dac85f 100644 (file)
@@ -1673,8 +1673,8 @@ dns_message_parse(dns_message_t *msg, isc_buffer_t *source,
                msg->saved.base = isc_mem_get(msg->mctx, msg->saved.length);
                if (msg->saved.base == NULL)
                        return (ISC_R_NOMEMORY);
-               memcpy(msg->saved.base, isc_buffer_base(&origsource),
-                      msg->saved.length);
+               memmove(msg->saved.base, isc_buffer_base(&origsource),
+                       msg->saved.length);
                msg->free_saved = 1;
        }
 
@@ -1746,7 +1746,7 @@ dns_message_renderchangebuffer(dns_message_t *msg, isc_buffer_t *buffer) {
         * Copy the contents from the old to the new buffer.
         */
        isc_buffer_add(buffer, r.length);
-       memcpy(rn.base, r.base, r.length);
+       memmove(rn.base, r.base, r.length);
 
        msg->buffer = buffer;
 
index 747d38b23ef94b6f9aaef8214f49a75633831346..1da252d9142de2805d9fb05eb962ec1269cc5303 100644 (file)
@@ -971,8 +971,8 @@ dns_name_clone(const dns_name_t *source, dns_name_t *target) {
                                DNS_NAMEATTR_DYNOFFSETS);
        if (target->offsets != NULL && source->labels > 0) {
                if (source->offsets != NULL)
-                       memcpy(target->offsets, source->offsets,
-                              source->labels);
+                       memmove(target->offsets, source->offsets,
+                               source->labels);
                else
                        set_offsets(target, target->offsets, NULL);
        }
@@ -1001,7 +1001,7 @@ dns_name_fromregion(dns_name_t *name, const isc_region_t *r) {
                len = (r->length < r2.length) ? r->length : r2.length;
                if (len > DNS_NAME_MAXWIRE)
                        len = DNS_NAME_MAXWIRE;
-               memcpy(r2.base, r->base, len);
+               memmove(r2.base, r->base, len);
                name->ndata = r2.base;
                name->length = len;
        } else {
@@ -1985,8 +1985,8 @@ dns_name_towire(const dns_name_t *name, dns_compress_t *cctx,
        if (gf) {
                if (target->length - target->used < gp.length)
                        return (ISC_R_NOSPACE);
-               (void)memcpy((unsigned char *)target->base + target->used,
-                            gp.ndata, (size_t)gp.length);
+               (void)memmove((unsigned char *)target->base + target->used,
+                             gp.ndata, (size_t)gp.length);
                isc_buffer_add(target, gp.length);
                go |= 0xc000;
                if (target->length - target->used < 2)
@@ -1997,8 +1997,8 @@ dns_name_towire(const dns_name_t *name, dns_compress_t *cctx,
        } else {
                if (target->length - target->used < name->length)
                        return (ISC_R_NOSPACE);
-               (void)memcpy((unsigned char *)target->base + target->used,
-                            name->ndata, (size_t)name->length);
+               (void)memmove((unsigned char *)target->base + target->used,
+                             name->ndata, (size_t)name->length);
                isc_buffer_add(target, name->length);
                dns_compress_add(cctx, name, name, offset);
        }
@@ -2082,8 +2082,8 @@ dns_name_concatenate(dns_name_t *prefix, dns_name_t *suffix, dns_name_t *name,
                        memmove(ndata + prefix_length, suffix->ndata,
                                suffix->length);
                else
-                       memcpy(ndata + prefix_length, suffix->ndata,
-                              suffix->length);
+                       memmove(ndata + prefix_length, suffix->ndata,
+                               suffix->length);
        }
 
        /*
@@ -2092,7 +2092,7 @@ dns_name_concatenate(dns_name_t *prefix, dns_name_t *suffix, dns_name_t *name,
         * copy anything.
         */
        if (copy_prefix && (prefix != name || prefix->buffer != target))
-               memcpy(ndata, prefix->ndata, prefix_length);
+               memmove(ndata, prefix->ndata, prefix_length);
 
        name->ndata = ndata;
        name->labels = labels;
@@ -2166,7 +2166,7 @@ dns_name_dup(const dns_name_t *source, isc_mem_t *mctx,
        if (target->ndata == NULL)
                return (ISC_R_NOMEMORY);
 
-       memcpy(target->ndata, source->ndata, source->length);
+       memmove(target->ndata, source->ndata, source->length);
 
        target->length = source->length;
        target->labels = source->labels;
@@ -2175,8 +2175,8 @@ dns_name_dup(const dns_name_t *source, isc_mem_t *mctx,
                target->attributes |= DNS_NAMEATTR_ABSOLUTE;
        if (target->offsets != NULL) {
                if (source->offsets != NULL)
-                       memcpy(target->offsets, source->offsets,
-                              source->labels);
+                       memmove(target->offsets, source->offsets,
+                               source->labels);
                else
                        set_offsets(target, target->offsets, NULL);
        }
@@ -2208,7 +2208,7 @@ dns_name_dupwithoffsets(dns_name_t *source, isc_mem_t *mctx,
        if (target->ndata == NULL)
                return (ISC_R_NOMEMORY);
 
-       memcpy(target->ndata, source->ndata, source->length);
+       memmove(target->ndata, source->ndata, source->length);
 
        target->length = source->length;
        target->labels = source->labels;
@@ -2218,7 +2218,7 @@ dns_name_dupwithoffsets(dns_name_t *source, isc_mem_t *mctx,
                target->attributes |= DNS_NAMEATTR_ABSOLUTE;
        target->offsets = target->ndata + source->length;
        if (source->offsets != NULL)
-               memcpy(target->offsets, source->offsets, source->labels);
+               memmove(target->offsets, source->offsets, source->labels);
        else
                set_offsets(target, target->offsets, NULL);
 
@@ -2446,7 +2446,7 @@ dns_name_copy(dns_name_t *source, dns_name_t *dest, isc_buffer_t *target) {
        ndata = (unsigned char *)target->base + target->used;
        dest->ndata = target->base;
 
-       memcpy(ndata, source->ndata, source->length);
+       memmove(ndata, source->ndata, source->length);
 
        dest->ndata = ndata;
        dest->labels = source->labels;
@@ -2458,7 +2458,7 @@ dns_name_copy(dns_name_t *source, dns_name_t *dest, isc_buffer_t *target) {
 
        if (dest->labels > 0 && dest->offsets != NULL) {
                if (source->offsets != NULL)
-                       memcpy(dest->offsets, source->offsets, source->labels);
+                       memmove(dest->offsets, source->offsets, source->labels);
                else
                        set_offsets(dest, dest->offsets, NULL);
        }
index 41b5dc3293eaa66fb4e3e1ddaae1abee4ed151d3..a303ff2904332313f4139a2b65880480fcb36fb9 100644 (file)
@@ -83,7 +83,7 @@ dns_nsec_buildrdata(dns_db_t *db, dns_dbversion_t *version,
 
        memset(buffer, 0, DNS_NSEC_BUFFERSIZE);
        dns_name_toregion(target, &r);
-       memcpy(buffer, r.base, r.length);
+       memmove(buffer, r.base, r.length);
        r.base = buffer;
        /*
         * Use the end of the space for a raw bitmap leaving enough
index 2afd573070c36ee8b166cba1a8f468441a2ae74f..3ab738ad8dff7bc3a9fff178edacbeea980e84e5 100644 (file)
@@ -119,11 +119,11 @@ dns_nsec3_buildrdata(dns_db_t *db, dns_dbversion_t *version,
        *p++ = iterations;
 
        *p++ = salt_length;
-       memcpy(p, salt, salt_length);
+       memmove(p, salt, salt_length);
        p += salt_length;
 
        *p++ = hash_length;
-       memcpy(p, nexthash, hash_length);
+       memmove(p, nexthash, hash_length);
        p += hash_length;
 
        r.length = p - buffer;
@@ -618,7 +618,7 @@ dns_nsec3_addnsec3(dns_db_t *db, dns_dbversion_t *version,
                                flags = nsec3.flags;
                        next_length = nsec3.next_length;
                        INSIST(next_length <= sizeof(nexthash));
-                       memcpy(nexthash, nsec3.next, next_length);
+                       memmove(nexthash, nsec3.next, next_length);
                        dns_rdataset_disassociate(&rdataset);
                        /*
                         * If the NSEC3 is not for a unsecure delegation then
@@ -718,7 +718,7 @@ dns_nsec3_addnsec3(dns_db_t *db, dns_dbversion_t *version,
                                           rdataset.ttl, &rdata, &tuple));
                CHECK(do_one_tuple(&tuple, db, version, diff));
                INSIST(old_length <= sizeof(nexthash));
-               memcpy(nexthash, old_next, old_length);
+               memmove(nexthash, old_next, old_length);
                if (!CREATE(nsec3param->flags))
                        flags = nsec3.flags;
                dns_rdata_reset(&rdata);
@@ -839,7 +839,7 @@ dns_nsec3_addnsec3(dns_db_t *db, dns_dbversion_t *version,
                                                   &tuple));
                        CHECK(do_one_tuple(&tuple, db, version, diff));
                        INSIST(old_length <= sizeof(nexthash));
-                       memcpy(nexthash, old_next, old_length);
+                       memmove(nexthash, old_next, old_length);
                        if (!CREATE(nsec3param->flags))
                                flags = nsec3.flags;
                        dns_rdata_reset(&rdata);
@@ -1075,7 +1075,7 @@ dns_nsec3_delnsec3(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name,
        if (result == ISC_R_SUCCESS) {
                next_length = nsec3.next_length;
                INSIST(next_length <= sizeof(nexthash));
-               memcpy(nexthash, nsec3.next, next_length);
+               memmove(nexthash, nsec3.next, next_length);
        }
        dns_rdataset_disassociate(&rdataset);
        if (result == ISC_R_NOMORE)
@@ -1176,7 +1176,7 @@ dns_nsec3_delnsec3(dns_db_t *db, dns_dbversion_t *version, dns_name_t *name,
                if (result == ISC_R_SUCCESS) {
                        next_length = nsec3.next_length;
                        INSIST(next_length <= sizeof(nexthash));
-                       memcpy(nexthash, nsec3.next, next_length);
+                       memmove(nexthash, nsec3.next, next_length);
                }
                dns_rdataset_disassociate(&rdataset);
                if (result == ISC_R_NOMORE)
index 457cfbd2503d2f1a1fd17116a0bb879061a9e2bc..4360c27187cf55f0383a3edd15331eb82fd8e1ac 100644 (file)
@@ -473,7 +473,7 @@ opensslrsa_sign(dst_context_t *dctx, isc_buffer_t *sig) {
                INSIST(prefixlen + digestlen <= sizeof(digest));
 
                memmove(digest + prefixlen, digest, digestlen);
-               memcpy(digest, prefix, prefixlen);
+               memmove(digest, prefix, prefixlen);
                status = RSA_private_encrypt(digestlen + prefixlen,
                                             digest, r.base, rsa,
                                             RSA_PKCS1_PADDING);
index 5bc89f4829840a3b867e1833ab417eebde51defc..ee24abd584c47cc18b159e5d2767a8118321ee88 100644 (file)
@@ -164,8 +164,8 @@ dns_portlist_add(dns_portlist_t *portlist, int af, in_port_t port) {
                        goto unlock;
                }
                if (portlist->list != NULL) {
-                       memcpy(el, portlist->list,
-                              portlist->allocated * sizeof(*el)); 
+                       memmove(el, portlist->list,
+                               portlist->allocated * sizeof(*el)); 
                        isc_mem_put(portlist->mctx, portlist->list,
                                    portlist->allocated * sizeof(*el));
                }
index 664585fe5783f358ff83651e259d0fd6e5b77d36..28b1e827b999911ad505e39363c52f00a2af3bcd 100644 (file)
@@ -1475,8 +1475,8 @@ create_node(isc_mem_t *mctx, dns_name_t *name, dns_rbtnode_t **nodep) {
        OLDOFFSETLEN(node) = OFFSETLEN(node) = labels;
        ATTRS(node) = name->attributes;
 
-       memcpy(NAME(node), region.base, region.length);
-       memcpy(OFFSETS(node), name->offsets, labels);
+       memmove(NAME(node), region.base, region.length);
+       memmove(OFFSETS(node), name->offsets, labels);
 
 #if DNS_RBT_USEMAGIC
        node->magic = DNS_RBTNODE_MAGIC;
@@ -1837,7 +1837,7 @@ dns_rbt_deletefromlevel(dns_rbtnode_t *delete, dns_rbtnode_t **rootp) {
                 * information, which will be needed when linking up
                 * delete to the successor's old location.
                 */
-               memcpy(tmp, successor, sizeof(dns_rbtnode_t));
+               memmove(tmp, successor, sizeof(dns_rbtnode_t));
 
                if (IS_ROOT(delete)) {
                        *rootp = successor;
index 941b77e92db6a2adb65603df6c9e9b33469cffd3..bf0eebe119c24fc91536c4fc4b32d39f0d5fdb14 100644 (file)
@@ -1118,8 +1118,8 @@ newversion(dns_db_t *db, dns_dbversion_t **versionp) {
                        version->hash = rbtdb->current_version->hash;
                        version->salt_length =
                                rbtdb->current_version->salt_length;
-                       memcpy(version->salt, rbtdb->current_version->salt,
-                              version->salt_length);
+                       memmove(version->salt, rbtdb->current_version->salt,
+                               version->salt_length);
                } else {
                        version->flags = 0;
                        version->iterations = 0;
@@ -2092,8 +2092,8 @@ setnsec3parameters(dns_db_t *db, rbtdb_version_t *version,
                                        continue;
 #endif
 
-                               memcpy(version->salt, nsec3param.salt,
-                                      nsec3param.salt_length);
+                               memmove(version->salt, nsec3param.salt,
+                                       nsec3param.salt_length);
                                version->hash = nsec3param.hash;
                                version->salt_length = nsec3param.salt_length;
                                version->iterations = nsec3param.iterations;
@@ -6753,7 +6753,8 @@ getnsec3parameters(dns_db_t *db, dns_dbversion_t *version, dns_hash_t *hash,
                        *hash = rbtversion->hash;
                if (salt != NULL && salt_length != NULL) {
                        REQUIRE(*salt_length >= rbtversion->salt_length);
-                       memcpy(salt, rbtversion->salt, rbtversion->salt_length);
+                       memmove(salt, rbtversion->salt,
+                               rbtversion->salt_length);
                }
                if (salt_length != NULL)
                        *salt_length = rbtversion->salt_length;
index 5d5a28da43366f58e9ee91a60cde5073d537acb4..d0ad93f25b71678b3a353fb23959529e82eae5fb 100644 (file)
@@ -186,7 +186,7 @@ str_totext(const char *source, isc_buffer_t *target) {
        if (l > region.length)
                return (ISC_R_NOSPACE);
 
-       memcpy(region.base, source, l);
+       memmove(region.base, source, l);
        isc_buffer_add(target, l);
        return (ISC_R_SUCCESS);
 }
index 7e17e3c505fe0d7411119125eff7876334c4f6b4..2164e91e3a5be4f9d2711c72857de28571084548 100644 (file)
@@ -279,7 +279,7 @@ locator_pton(const char *src, unsigned char *dst) {
        }
        if (tp != endp)
                return (0);
-       memcpy(dst, tmp, NS_LOCATORSZ);
+       memmove(dst, tmp, NS_LOCATORSZ);
        return (1);
 }
 
@@ -320,7 +320,7 @@ mem_maybedup(isc_mem_t *mctx, void *source, size_t length) {
                return (source);
        new = isc_mem_allocate(mctx, length);
        if (new != NULL)
-               memcpy(new, source, length);
+               memmove(new, source, length);
 
        return (new);
 }
@@ -573,7 +573,7 @@ dns_rdata_towire(dns_rdata_t *rdata, dns_compress_t *cctx,
                isc_buffer_availableregion(target, &tr);
                if (tr.length < rdata->length)
                        return (ISC_R_NOSPACE);
-               memcpy(tr.base, rdata->data, rdata->length);
+               memmove(tr.base, rdata->data, rdata->length);
                isc_buffer_add(target, rdata->length);
                return (ISC_R_SUCCESS);
        }
@@ -1246,7 +1246,7 @@ txt_fromwire(isc_buffer_t *source, isc_buffer_t *target) {
                return (ISC_R_NOSPACE);
 
        if (tregion.base != sregion.base)
-               memcpy(tregion.base, sregion.base, n);
+               memmove(tregion.base, sregion.base, n);
        isc_buffer_forward(source, n);
        isc_buffer_add(target, n);
        return (ISC_R_SUCCESS);
@@ -1395,7 +1395,7 @@ multitxt_fromwire(isc_buffer_t *source, isc_buffer_t *target) {
                if (n > tregion.length)
                        return (ISC_R_NOSPACE);
 
-               memcpy(tregion.base, sregion.base, n);
+               memmove(tregion.base, sregion.base, n);
                isc_buffer_forward(source, n);
                isc_buffer_add(target, n);
                isc_buffer_activeregion(source, &sregion);
@@ -1446,7 +1446,7 @@ str_totext(const char *source, isc_buffer_t *target) {
        if (l > region.length)
                return (ISC_R_NOSPACE);
 
-       memcpy(region.base, source, l);
+       memmove(region.base, source, l);
        isc_buffer_add(target, l);
        return (ISC_R_SUCCESS);
 }
@@ -1572,7 +1572,7 @@ mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) {
        if (length > tr.length)
                return (ISC_R_NOSPACE);
        if (tr.base != base)
-               memcpy(tr.base, base, length);
+               memmove(tr.base, base, length);
        isc_buffer_add(target, length);
        return (ISC_R_SUCCESS);
 }
index c2ecbe95d77251969358822812c1d1ac602f9f4c..46f90f6e541f2e1582ba5e3c695cc6b088e5c94b 100644 (file)
@@ -117,7 +117,7 @@ fromwire_ch_a(ARGS_FROMWIRE) {
        if (tregion.length < 2)
                return (ISC_R_NOSPACE);
 
-       memcpy(tregion.base, sregion.base, 2);
+       memmove(tregion.base, sregion.base, 2);
        isc_buffer_forward(source, 2);
        isc_buffer_add(target, 2);
 
@@ -149,7 +149,7 @@ towire_ch_a(ARGS_TOWIRE) {
        if (tregion.length < 2)
                return (ISC_R_NOSPACE);
 
-       memcpy(tregion.base, sregion.base, 2);
+       memmove(tregion.base, sregion.base, 2);
        isc_buffer_add(target, 2);
        return (ISC_R_SUCCESS);
 }
index cfedf9f3b537a541c795b70e8be788849f7be8ed..dea174fd125837d031abb0565160b941d48bdcd4 100644 (file)
@@ -113,7 +113,7 @@ fromwire_afsdb(ARGS_FROMWIRE) {
                return (ISC_R_NOSPACE);
        if (sr.length < 2)
                return (ISC_R_UNEXPECTEDEND);
-       memcpy(tr.base, sr.base, 2);
+       memmove(tr.base, sr.base, 2);
        isc_buffer_forward(source, 2);
        isc_buffer_add(target, 2);
        return (dns_name_fromwire(&name, source, dctx, options, target));
@@ -134,7 +134,7 @@ towire_afsdb(ARGS_TOWIRE) {
        dns_rdata_toregion(rdata, &sr);
        if (tr.length < 2)
                return (ISC_R_NOSPACE);
-       memcpy(tr.base, sr.base, 2);
+       memmove(tr.base, sr.base, 2);
        isc_region_consume(&sr, 2);
        isc_buffer_add(target, 2);
 
index 3e52fec0ed4a2055094a3c82ff3c1b1ef6868438..898ffc71db088fe82febc81fbff585a04b54a6be 100644 (file)
@@ -142,7 +142,7 @@ tostruct_eui48(ARGS_TOSTRUCT) {
        eui48->common.rdtype = rdata->type;
        ISC_LINK_INIT(&eui48->common, link);
 
-       memcpy(eui48->eui48, rdata->data, rdata->length);
+       memmove(eui48->eui48, rdata->data, rdata->length);
        return (ISC_R_SUCCESS);
 }
 
index 245994fdf5c0bd619facbe0cc73f5258da67a51e..17eb7e820d3dfb26035674c20d17e586050c5af9 100644 (file)
@@ -147,7 +147,7 @@ tostruct_eui64(ARGS_TOSTRUCT) {
        eui64->common.rdtype = rdata->type;
        ISC_LINK_INIT(&eui64->common, link);
 
-       memcpy(eui64->eui64, rdata->data, rdata->length);
+       memmove(eui64->eui64, rdata->data, rdata->length);
        return (ISC_R_SUCCESS);
 }
 
index df11837e01dfdcc2b83c870ff2c5a08c6ef1a5e6..87af250420470c89d952cb5c3f717c61a56b785b 100644 (file)
@@ -87,7 +87,7 @@ fromtext_ipseckey(ARGS_FROMTEXT) {
                isc_buffer_availableregion(target, &region);
                if (region.length < 4)
                        return (ISC_R_NOSPACE);
-               memcpy(region.base, &addr, 4);
+               memmove(region.base, &addr, 4);
                isc_buffer_add(target, 4);
                break;
 
@@ -97,7 +97,7 @@ fromtext_ipseckey(ARGS_FROMTEXT) {
                isc_buffer_availableregion(target, &region);
                if (region.length < 16)
                        return (ISC_R_NOSPACE);
-               memcpy(region.base, addr6, 16);
+               memmove(region.base, addr6, 16);
                isc_buffer_add(target, 16);
                break;
 
@@ -361,7 +361,7 @@ tostruct_ipseckey(ARGS_TOSTRUCT) {
                break;
 
        case 2:
-               memcpy(ipseckey->in6_addr.s6_addr, region.base, 16);
+               memmove(ipseckey->in6_addr.s6_addr, region.base, 16);
                isc_region_consume(&region, 16);
                break;
 
index 678eb3de2196b2d46c843787c5f541668f7931da..e78e92f76ec74fd09c1a97feab86f49787a7aae0 100644 (file)
@@ -51,7 +51,7 @@ fromtext_l32(ARGS_FROMTEXT) {
        isc_buffer_availableregion(target, &region);
        if (region.length < 4)
                return (ISC_R_NOSPACE);
-       memcpy(region.base, &addr, 4);
+       memmove(region.base, &addr, 4);
        isc_buffer_add(target, 4);
        return (ISC_R_SUCCESS);
 }
index d69f4fc3c576a3433bed51167b2fd2ec97e2d2e6..a95669540f23f1d2eb49489d94357e2da35efee5 100644 (file)
@@ -155,7 +155,7 @@ tostruct_l64(ARGS_TOSTRUCT) {
 
        dns_rdata_toregion(rdata, &region);
        l64->pref = uint16_fromregion(&region);
-       memcpy(l64->l64, region.base, region.length);
+       memmove(l64->l64, region.base, region.length);
        return (ISC_R_SUCCESS);
 }
 
index 26f3186ebfa98fba2803d79836edc0a1e757dfd4..c1678c5ce034115c0375253327a66f06277af047 100644 (file)
@@ -155,7 +155,7 @@ tostruct_nid(ARGS_TOSTRUCT) {
 
        dns_rdata_toregion(rdata, &region);
        nid->pref = uint16_fromregion(&region);
-       memcpy(nid->nid, region.base, region.length);
+       memmove(nid->nid, region.base, region.length);
        return (ISC_R_SUCCESS);
 }
 
index c471ec5adbff259942bbafb009de165db600f98a..8e02b134fb60a9bec1c7a0d38067b600967c4361 100644 (file)
@@ -158,7 +158,7 @@ fromwire_opt(ARGS_FROMWIRE) {
        isc_buffer_availableregion(target, &tregion);
        if (tregion.length < total)
                return (ISC_R_NOSPACE);
-       memcpy(tregion.base, sregion.base, total);
+       memmove(tregion.base, sregion.base, total);
        isc_buffer_forward(source, total);
        isc_buffer_add(target, total);
 
index e631f2886993a25840ba4c32dd8a325e9334e2dd..2b389eea79055cbd2c5b53c0e1692b831d588c5c 100644 (file)
@@ -109,7 +109,7 @@ fromwire_rt(ARGS_FROMWIRE) {
                return (ISC_R_NOSPACE);
        if (sregion.length < 2)
                return (ISC_R_UNEXPECTEDEND);
-       memcpy(tregion.base, sregion.base, 2);
+       memmove(tregion.base, sregion.base, 2);
        isc_buffer_forward(source, 2);
        isc_buffer_add(target, 2);
        return (dns_name_fromwire(&name, source, dctx, options, target));
@@ -130,7 +130,7 @@ towire_rt(ARGS_TOWIRE) {
        dns_rdata_toregion(rdata, &region);
        if (tr.length < 2)
                return (ISC_R_NOSPACE);
-       memcpy(tr.base, region.base, 2);
+       memmove(tr.base, region.base, 2);
        isc_region_consume(&region, 2);
        isc_buffer_add(target, 2);
 
index cdea9d4447b1af22cdc6e1cd0f1fb7e81e7f83dd..16f204b6a4ceb2254e09f9eaac4a4c6689b3c777 100644 (file)
@@ -186,7 +186,7 @@ fromwire_soa(ARGS_FROMWIRE) {
        if (tregion.length < 20)
                return (ISC_R_NOSPACE);
 
-       memcpy(tregion.base, sregion.base, 20);
+       memmove(tregion.base, sregion.base, 20);
        isc_buffer_forward(source, 20);
        isc_buffer_add(target, 20);
 
@@ -224,7 +224,7 @@ towire_soa(ARGS_TOWIRE) {
        if (tregion.length < 20)
                return (ISC_R_NOSPACE);
 
-       memcpy(tregion.base, sregion.base, 20);
+       memmove(tregion.base, sregion.base, 20);
        isc_buffer_add(target, 20);
        return (ISC_R_SUCCESS);
 }
index 92c6f57a73c1c95c2ef4085085b3a585aa68b0e6..16968d13826efa348df2c28feb59748a5fdd1d89 100644 (file)
@@ -103,7 +103,7 @@ towire_spf(ARGS_TOWIRE) {
        if (region.length < rdata->length)
                return (ISC_R_NOSPACE);
 
-       memcpy(region.base, rdata->data, rdata->length);
+       memmove(region.base, rdata->data, rdata->length);
        isc_buffer_add(target, rdata->length);
        return (ISC_R_SUCCESS);
 }
index 3fe02c09db80f8045f4b1a7579eaacc0cf6fb77b..de36acdca0b46fd9f082fd11934828fb54ebe37e 100644 (file)
@@ -110,7 +110,7 @@ towire_txt(ARGS_TOWIRE) {
        if (region.length < rdata->length)
                return (ISC_R_NOSPACE);
 
-       memcpy(region.base, rdata->data, rdata->length);
+       memmove(region.base, rdata->data, rdata->length);
        isc_buffer_add(target, rdata->length);
        return (ISC_R_SUCCESS);
 }
index e8d2ef5fe6ec3e2aae0f2ff8dbc7712456f46728..919ef20999c9cc36329a16c69d986402a189c69a 100644 (file)
@@ -48,7 +48,7 @@ fromtext_hs_a(ARGS_FROMTEXT) {
        isc_buffer_availableregion(target, &region);
        if (region.length < 4)
                return (ISC_R_NOSPACE);
-       memcpy(region.base, &addr, 4);
+       memmove(region.base, &addr, 4);
        isc_buffer_add(target, 4);
        return (ISC_R_SUCCESS);
 }
@@ -87,7 +87,7 @@ fromwire_hs_a(ARGS_FROMWIRE) {
        if (tregion.length < 4)
                return (ISC_R_NOSPACE);
 
-       memcpy(tregion.base, sregion.base, 4);
+       memmove(tregion.base, sregion.base, 4);
        isc_buffer_forward(source, 4);
        isc_buffer_add(target, 4);
        return (ISC_R_SUCCESS);
@@ -106,7 +106,7 @@ towire_hs_a(ARGS_TOWIRE) {
        isc_buffer_availableregion(target, &region);
        if (region.length < rdata->length)
                return (ISC_R_NOSPACE);
-       memcpy(region.base, rdata->data, rdata->length);
+       memmove(region.base, rdata->data, rdata->length);
        isc_buffer_add(target, 4);
        return (ISC_R_SUCCESS);
 }
index 16a6a931a80f5eb2d6274b931bcc1e4c3aa79f09..2afb23bd775712ad03337c415c159fbbb2e13d91 100644 (file)
@@ -122,7 +122,7 @@ totext_in_a6(ARGS_TOTEXT) {
        if (prefixlen != 128) {
                octets = prefixlen/8;
                memset(addr, 0, sizeof(addr));
-               memcpy(&addr[octets], sr.base, 16 - octets);
+               memmove(&addr[octets], sr.base, 16 - octets);
                mask = 0xff >> (prefixlen % 8);
                addr[octets] &= mask;
                ar.base = addr;
@@ -347,7 +347,7 @@ tostruct_in_a6(ARGS_TOSTRUCT) {
        if (a6->prefixlen != 128) {
                octets = 16 - a6->prefixlen / 8;
                INSIST(r.length >= octets);
-               memcpy(a6->in6_addr.s6_addr + 16 - octets, r.base, octets);
+               memmove(a6->in6_addr.s6_addr + 16 - octets, r.base, octets);
                isc_region_consume(&r, octets);
        }
 
index 0f659744b50b35f71bc33d79bc379e188164b09f..1b1488d611394a894f6520250d52d23cd5bcb675 100644 (file)
@@ -50,7 +50,7 @@ fromtext_in_a(ARGS_FROMTEXT) {
        isc_buffer_availableregion(target, &region);
        if (region.length < 4)
                return (ISC_R_NOSPACE);
-       memcpy(region.base, &addr, 4);
+       memmove(region.base, &addr, 4);
        isc_buffer_add(target, 4);
        return (ISC_R_SUCCESS);
 }
@@ -89,7 +89,7 @@ fromwire_in_a(ARGS_FROMWIRE) {
        if (tregion.length < 4)
                return (ISC_R_NOSPACE);
 
-       memcpy(tregion.base, sregion.base, 4);
+       memmove(tregion.base, sregion.base, 4);
        isc_buffer_forward(source, 4);
        isc_buffer_add(target, 4);
        return (ISC_R_SUCCESS);
@@ -108,7 +108,7 @@ towire_in_a(ARGS_TOWIRE) {
        isc_buffer_availableregion(target, &region);
        if (region.length < rdata->length)
                return (ISC_R_NOSPACE);
-       memcpy(region.base, rdata->data, rdata->length);
+       memmove(region.base, rdata->data, rdata->length);
        isc_buffer_add(target, 4);
        return (ISC_R_SUCCESS);
 }
index 69f8c20bb765cb15b3a6ce96ef2ff8dcb42ccea2..f5e00e4f61ecd57f47d88205f182fe59d89a7843 100644 (file)
@@ -51,7 +51,7 @@ fromtext_in_aaaa(ARGS_FROMTEXT) {
        isc_buffer_availableregion(target, &region);
        if (region.length < 16)
                return (ISC_R_NOSPACE);
-       memcpy(region.base, addr, 16);
+       memmove(region.base, addr, 16);
        isc_buffer_add(target, 16);
        return (ISC_R_SUCCESS);
 }
@@ -90,7 +90,7 @@ fromwire_in_aaaa(ARGS_FROMWIRE) {
        if (tregion.length < 16)
                return (ISC_R_NOSPACE);
 
-       memcpy(tregion.base, sregion.base, 16);
+       memmove(tregion.base, sregion.base, 16);
        isc_buffer_forward(source, 16);
        isc_buffer_add(target, 16);
        return (ISC_R_SUCCESS);
@@ -109,7 +109,7 @@ towire_in_aaaa(ARGS_TOWIRE) {
        isc_buffer_availableregion(target, &region);
        if (region.length < rdata->length)
                return (ISC_R_NOSPACE);
-       memcpy(region.base, rdata->data, rdata->length);
+       memmove(region.base, rdata->data, rdata->length);
        isc_buffer_add(target, 16);
        return (ISC_R_SUCCESS);
 }
@@ -165,7 +165,7 @@ tostruct_in_aaaa(ARGS_TOSTRUCT) {
 
        dns_rdata_toregion(rdata, &r);
        INSIST(r.length == 16);
-       memcpy(aaaa->in6_addr.s6_addr, r.base, 16);
+       memmove(aaaa->in6_addr.s6_addr, r.base, 16);
 
        return (ISC_R_SUCCESS);
 }
index 633ef495c0428083c35aba2ef325b33d337e5674..38adf0b24f4a839050ed2ea26405cc7b486edf06 100644 (file)
@@ -148,7 +148,7 @@ totext_in_apl(ARGS_TOTEXT) {
                        INSIST(len <= 4);
                        INSIST(prefix <= 32);
                        memset(buf, 0, sizeof(buf));
-                       memcpy(buf, sr.base, len);
+                       memmove(buf, sr.base, len);
                        RETERR(inet_totext(AF_INET, &ir, target));
                        break;
 
@@ -156,7 +156,7 @@ totext_in_apl(ARGS_TOTEXT) {
                        INSIST(len <= 16);
                        INSIST(prefix <= 128);
                        memset(buf, 0, sizeof(buf));
-                       memcpy(buf, sr.base, len);
+                       memmove(buf, sr.base, len);
                        RETERR(inet_totext(AF_INET6, &ir, target));
                        break;
 
index 58a5e85ec3d2c62c143617074c8dabd7c17e41e4..e7e9aa74ab19ad536c3e40f687f441809b3c96bf 100644 (file)
@@ -98,7 +98,7 @@ fromtext_in_wks(ARGS_FROMTEXT) {
                RETTOK(DNS_R_BADDOTTEDQUAD);
        if (region.length < 4)
                return (ISC_R_NOSPACE);
-       memcpy(region.base, &addr, 4);
+       memmove(region.base, &addr, 4);
        isc_buffer_add(target, 4);
 
        /*
@@ -222,7 +222,7 @@ fromwire_in_wks(ARGS_FROMWIRE) {
        if (tr.length < sr.length)
                return (ISC_R_NOSPACE);
 
-       memcpy(tr.base, sr.base, sr.length);
+       memmove(tr.base, sr.base, sr.length);
        isc_buffer_add(target, sr.length);
        isc_buffer_forward(source, sr.length);
 
index bfb542d7cefb042be193f40e9c31508ac1332d6a..79a957ae6254a3ec3ae31dcce04c228b60a6ab18 100644 (file)
@@ -311,7 +311,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx,
                        *rawbuf++ |= (x[i].rdata.flags & DNS_RDATA_OFFLINE) ?
                                            DNS_RDATASLAB_OFFLINE : 0;
                }
-               memcpy(rawbuf, x[i].rdata.data, x[i].rdata.length);
+               memmove(rawbuf, x[i].rdata.data, x[i].rdata.length);
                rawbuf += x[i].rdata.length;
        }
 
@@ -703,7 +703,7 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
        tstart = isc_mem_get(mctx, tlength);
        if (tstart == NULL)
                return (ISC_R_NOMEMORY);
-       memcpy(tstart, nslab, reservelen);
+       memmove(tstart, nslab, reservelen);
        tcurrent = tstart + reservelen;
 #if DNS_RDATASET_FIXED
        offsetbase = tcurrent;
@@ -782,7 +782,7 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
 #if DNS_RDATASET_FIXED
                        tcurrent += 2;  /* fill in later */
 #endif
-                       memcpy(tcurrent, data, length);
+                       memmove(tcurrent, data, length);
                        tcurrent += length;
                        oadded++;
                        if (oadded < ocount) {
@@ -809,7 +809,7 @@ dns_rdataslab_merge(unsigned char *oslab, unsigned char *nslab,
 #if DNS_RDATASET_FIXED
                        tcurrent += 2;  /* fill in later */
 #endif
-                       memcpy(tcurrent, data, length);
+                       memmove(tcurrent, data, length);
                        tcurrent += length;
                        nadded++;
                        if (nadded < ncount) {
@@ -941,7 +941,7 @@ dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab,
        tstart = isc_mem_get(mctx, tlength);
        if (tstart == NULL)
                return (ISC_R_NOMEMORY);
-       memcpy(tstart, mslab, reservelen);
+       memmove(tstart, mslab, reservelen);
        tcurrent = tstart + reservelen;
 #if DNS_RDATASET_FIXED
        offsetbase = tcurrent;
@@ -996,7 +996,7 @@ dns_rdataslab_subtract(unsigned char *mslab, unsigned char *sslab,
 #if DNS_RDATASET_FIXED
                        offsettable[order] = tcurrent - offsetbase;
 #endif
-                       memcpy(tcurrent, mrdatabegin, length);
+                       memmove(tcurrent, mrdatabegin, length);
                        tcurrent += length;
                }
                dns_rdata_reset(&mrdata);
index 261a8ddb7bdf74ef3c0edcf5a8df07408c70de77..a9cd77734df8386d0306dd6ad73f4f6fd53471c6 100644 (file)
@@ -8464,7 +8464,7 @@ dns_resolver_disable_algorithm(dns_resolver_t *resolver, dns_name_t *name,
                        }
                        memset(new, 0, len);
                        if (algorithms != NULL)
-                               memcpy(new, algorithms, *algorithms);
+                               memmove(new, algorithms, *algorithms);
                        new[len-1] |= mask;
                        *new = len;
                        node->data = new;
index a23cd0c4f84a82c5aa8b0bc900fd5b91fa5f7344..56a61b0071c6a5726d333795ebcf6932435f9fef 100644 (file)
@@ -463,7 +463,7 @@ code_NegTokenArg(OM_uint32 * minor_status,
                free(buf);
                return (GSS_S_FAILURE);
        }
-       memcpy(*outbuf, buf + buf_size - buf_len, buf_len);
+       memmove(*outbuf, buf + buf_size - buf_len, buf_len);
        *outbuf_size = buf_len;
 
        free(buf);
@@ -856,7 +856,7 @@ der_get_octet_string(const unsigned char *p, size_t len,
                data->data = malloc(len);
                if (data->data == NULL)
                        return (ENOMEM);
-               memcpy(data->data, p, len);
+               memmove(data->data, p, len);
        } else
                data->data = NULL;
        if (size)
@@ -1217,7 +1217,7 @@ der_put_octet_string(unsigned char *p, size_t len,
        p -= data->length;
        len -= data->length;
        POST(len);
-       memcpy(p + 1, data->data, data->length);
+       memmove(p + 1, data->data, data->length);
        *size = data->length;
        return (0);
 }
@@ -1397,7 +1397,7 @@ gssapi_mech_make_header(u_char *p,
        p += len_len;
        *p++ = 0x06;
        *p++ = mech->length;
-       memcpy(p, mech->elements, mech->length);
+       memmove(p, mech->elements, mech->length);
        p += mech->length;
        return (p);
 }
@@ -1430,7 +1430,7 @@ gssapi_spnego_encapsulate(OM_uint32 * minor_status,
                        gss_release_buffer(minor_status, output_token);
                return (GSS_S_FAILURE);
        }
-       memcpy(p, buf, buf_size);
+       memmove(p, buf, buf_size);
        return (GSS_S_COMPLETE);
 }
 
index bbfe4ed3ab86b05bbe419cb403024fe0845005c4..c36ce1e2e9bcccb0db4c34aac295b28b49f9cc66 100644 (file)
@@ -214,7 +214,7 @@ dns_ssutable_addrule(dns_ssutable_t *table, isc_boolean_t grant,
                        result = ISC_R_NOMEMORY;
                        goto failure;
                }
-               memcpy(rule->types, types, ntypes * sizeof(dns_rdatatype_t));
+               memmove(rule->types, types, ntypes * sizeof(dns_rdatatype_t));
        } else
                rule->types = NULL;
 
index 0f245a246a9d87144062f71214cee4c2d9dbf0ed..ab16f4f5853509e4adca6686d369aaf43151c4ee 100644 (file)
@@ -98,7 +98,7 @@ dns_time64_totext(isc_int64_t t, isc_buffer_t *target) {
        if (l > region.length)
                return (ISC_R_NOSPACE);
 
-       memcpy(region.base, buf, l);
+       memmove(region.base, buf, l);
        isc_buffer_add(target, l);
        return (ISC_R_SUCCESS);
 }
index e6eb17d714fc6fa4a06d221b7b56b2470dfdbafd..c62d547c04eeaf7b47ede4b2af71bfc368a57d70 100644 (file)
@@ -148,7 +148,7 @@ add_rdata_to_list(dns_message_t *msg, dns_name_t *name, dns_rdata_t *rdata,
        dns_rdata_toregion(rdata, &r);
        RETERR(isc_buffer_allocate(msg->mctx, &tmprdatabuf, r.length));
        isc_buffer_availableregion(tmprdatabuf, &newr);
-       memcpy(newr.base, r.base, r.length);
+       memmove(newr.base, r.base, r.length);
        dns_rdata_fromregion(newrdata, rdata->rdclass, rdata->type, &newr);
        dns_message_takebuffer(msg, &tmprdatabuf);
 
@@ -248,12 +248,12 @@ compute_secret(isc_buffer_t *shared, isc_region_t *queryrandomness,
        if (r.length < sizeof(digests) || r.length < r2.length)
                return (ISC_R_NOSPACE);
        if (r2.length > sizeof(digests)) {
-               memcpy(r.base, r2.base, r2.length);
+               memmove(r.base, r2.base, r2.length);
                for (i = 0; i < sizeof(digests); i++)
                        r.base[i] ^= digests[i];
                isc_buffer_add(secret, r2.length);
        } else {
-               memcpy(r.base, digests, sizeof(digests));
+               memmove(r.base, digests, sizeof(digests));
                for (i = 0; i < r2.length; i++)
                        r.base[i] ^= r2.base[i];
                isc_buffer_add(secret, sizeof(digests));
@@ -516,7 +516,7 @@ process_gsstkey(dns_name_t *name, dns_rdata_tkey_t *tkeyin,
                        goto failure;
                }
                tkeyout->keylen = isc_buffer_usedlength(outtoken);
-               memcpy(tkeyout->key, isc_buffer_base(outtoken),
+               memmove(tkeyout->key, isc_buffer_base(outtoken),
                       isc_buffer_usedlength(outtoken));
                isc_buffer_free(&outtoken);
        } else {
@@ -526,7 +526,7 @@ process_gsstkey(dns_name_t *name, dns_rdata_tkey_t *tkeyin,
                        goto failure;
                }
                tkeyout->keylen = tkeyin->keylen;
-               memcpy(tkeyout->key, tkeyin->key, tkeyin->keylen);
+               memmove(tkeyout->key, tkeyin->key, tkeyin->keylen);
        }
 
        tkeyout->error = dns_rcode_noerror;
index 2a894c844ac1ef502084c38ef2d9acf2d52e9906..c2486f89feb61a33e1cbfd788c1dd9e0569f8ddd 100644 (file)
@@ -1172,21 +1172,21 @@ dns_tsig_verify(isc_buffer_t *source, dns_message_t *msg,
                 * Extract the header.
                 */
                isc_buffer_usedregion(source, &r);
-               memcpy(header, r.base, DNS_MESSAGE_HEADERLEN);
+               memmove(header, r.base, DNS_MESSAGE_HEADERLEN);
                isc_region_consume(&r, DNS_MESSAGE_HEADERLEN);
 
                /*
                 * Decrement the additional field counter.
                 */
-               memcpy(&addcount, &header[DNS_MESSAGE_HEADERLEN - 2], 2);
+               memmove(&addcount, &header[DNS_MESSAGE_HEADERLEN - 2], 2);
                addcount = htons((isc_uint16_t)(ntohs(addcount) - 1));
-               memcpy(&header[DNS_MESSAGE_HEADERLEN - 2], &addcount, 2);
+               memmove(&header[DNS_MESSAGE_HEADERLEN - 2], &addcount, 2);
 
                /*
                 * Put in the original id.
                 */
                id = htons(tsig.originalid);
-               memcpy(&header[0], &id, 2);
+               memmove(&header[0], &id, 2);
 
                /*
                 * Digest the modified header.
@@ -1411,16 +1411,16 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) {
         * Extract the header.
         */
        isc_buffer_usedregion(source, &r);
-       memcpy(header, r.base, DNS_MESSAGE_HEADERLEN);
+       memmove(header, r.base, DNS_MESSAGE_HEADERLEN);
        isc_region_consume(&r, DNS_MESSAGE_HEADERLEN);
 
        /*
         * Decrement the additional field counter if necessary.
         */
        if (has_tsig) {
-               memcpy(&addcount, &header[DNS_MESSAGE_HEADERLEN - 2], 2);
+               memmove(&addcount, &header[DNS_MESSAGE_HEADERLEN - 2], 2);
                addcount = htons((isc_uint16_t)(ntohs(addcount) - 1));
-               memcpy(&header[DNS_MESSAGE_HEADERLEN - 2], &addcount, 2);
+               memmove(&header[DNS_MESSAGE_HEADERLEN - 2], &addcount, 2);
        }
 
        /*
@@ -1429,7 +1429,7 @@ tsig_verify_tcp(isc_buffer_t *source, dns_message_t *msg) {
        /* XXX Can TCP transfers be forwarded?  How would that work? */
        if (has_tsig) {
                id = htons(tsig.originalid);
-               memcpy(&header[0], &id, 2);
+               memmove(&header[0], &id, 2);
        }
 
        /*
index d3cf024138db1316613ad31b4183bdb8c033810f..ddb5358a7437e61e57714006510fc9494a9b68fa 100644 (file)
@@ -68,7 +68,7 @@ ttlfmt(unsigned int t, const char *s, isc_boolean_t verbose,
        isc_buffer_availableregion(target, &region);
        if (len > region.length)
                return (ISC_R_NOSPACE);
-       memcpy(region.base, tmp, len);
+       memmove(region.base, tmp, len);
        isc_buffer_add(target, len);
 
        return (ISC_R_SUCCESS);
index 5e305d574d251ab528397c0e7c561c996cfb8177..8e7966252d0ad3f76311cff22a4e7325d42e2e57 100644 (file)
@@ -2024,7 +2024,7 @@ isspf(const dns_rdata_t *rdata) {
                INSIST(tl <= rdl);
                if (len > sizeof(buf) - i - 1)
                        len = sizeof(buf) - i - 1;
-               memcpy(buf + i, data, len);
+               memmove(buf + i, data, len);
                i += len;
                data += tl;
                rdl -= tl;
@@ -2341,7 +2341,7 @@ zone_addnsec3chain(dns_zone_t *zone, dns_rdata_nsec3param_t *nsec3param) {
        nsec3chain->nsec3param.iterations = nsec3param->iterations;
        nsec3chain->nsec3param.flags = nsec3param->flags;
        nsec3chain->nsec3param.salt_length = nsec3param->salt_length;
-       memcpy(nsec3chain->salt, nsec3param->salt, nsec3param->salt_length);
+       memmove(nsec3chain->salt, nsec3param->salt, nsec3param->salt_length);
        nsec3chain->nsec3param.salt = nsec3chain->salt;
        nsec3chain->seen_nsec = ISC_FALSE;
        nsec3chain->delete_nsec = ISC_FALSE;
@@ -3405,7 +3405,7 @@ dns_zone_setalsonotify(dns_zone_t *zone, const isc_sockaddr_t *notify,
                        UNLOCK_ZONE(zone);
                        return (ISC_R_NOMEMORY);
                }
-               memcpy(new, notify, count * sizeof(*new));
+               memmove(new, notify, count * sizeof(*new));
                zone->notify = new;
                zone->notifycnt = count;
        }
@@ -3527,7 +3527,7 @@ dns_zone_setmasterswithkeys(dns_zone_t *zone,
                result = ISC_R_NOMEMORY;
                goto unlock;
        }
-       memcpy(new, masters, count * sizeof(*new));
+       memmove(new, masters, count * sizeof(*new));
 
        /*
         * Similarly for mastersok.
index 86480e0dadccce1799176c242e1ceb14f55073eb..d3d44e40eeded42c1bc92d3bb0a4a986767e29df 100644 (file)
@@ -355,7 +355,7 @@ str_totext(const char *source, isc_buffer_t *target) {
        if (l > region.length)
                return (ISC_R_NOSPACE);
 
-       memcpy(region.base, source, l);
+       memmove(region.base, source, l);
        isc_buffer_add(target, l);
        return (ISC_R_SUCCESS);
 }
@@ -367,7 +367,7 @@ mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) {
        isc_buffer_availableregion(target, &tr);
        if (length > tr.length)
                return (ISC_R_NOSPACE);
-       memcpy(tr.base, base, length);
+       memmove(tr.base, base, length);
        isc_buffer_add(target, length);
        return (ISC_R_SUCCESS);
 }
index ac1398d0d778788d7362efa79628af5b912d29fb..ea778183c831a07a2737d47d88e946fd2560108c 100644 (file)
@@ -234,7 +234,7 @@ str_totext(const char *source, isc_buffer_t *target) {
        if (l > region.length)
                return (ISC_R_NOSPACE);
 
-       memcpy(region.base, source, l);
+       memmove(region.base, source, l);
        isc_buffer_add(target, l);
        return (ISC_R_SUCCESS);
 }
@@ -246,7 +246,7 @@ mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) {
        isc_buffer_availableregion(target, &tr);
        if (length > tr.length)
                return (ISC_R_NOSPACE);
-       memcpy(tr.base, base, length);
+       memmove(tr.base, base, length);
        isc_buffer_add(target, length);
        return (ISC_R_SUCCESS);
 }
index e37af15968a9b5cc182e6fd81d1d4f31282fb88b..2d74477379b6e5e9c043ca37c8815842d2f235b5 100644 (file)
@@ -420,7 +420,7 @@ isc__buffer_putstr(isc_buffer_t *b, const char *source) {
        REQUIRE(l <= isc_buffer_availablelength(b));
 
        cp = isc_buffer_used(b);
-       memcpy(cp, source, l);
+       memmove(cp, source, l);
        b->used += l;
 }
 
@@ -439,7 +439,7 @@ isc_buffer_copyregion(isc_buffer_t *b, const isc_region_t *r) {
        available = isc_buffer_availablelength(b);
        if (r->length > available)
                return (ISC_R_NOSPACE);
-       memcpy(base, r->base, r->length);
+       memmove(base, r->base, r->length);
        b->used += r->length;
 
        return (ISC_R_SUCCESS);
index 829676f1284f7fa539f06b33ac39f5150c27a0bf..2346cbbe2b422387e713f6618cc96174c2909463 100644 (file)
@@ -261,7 +261,7 @@ isc_hash_ctxinit(isc_hash_t *hctx) {
                        else
                                copylen = hctx->vectorlen - i;
 
-                       memcpy(p, &pr, copylen);
+                       memmove(p, &pr, copylen);
                }
                INSIST(p == (unsigned char *)hctx->rndvector +
                       hctx->vectorlen);
index ebadd2fd807cc5ac222f33d3c63d893396515769..714e43557b57db5085eac13685cc57f2155a67ae 100644 (file)
@@ -32,7 +32,7 @@
 #include <isc/heap.h>
 #include <isc/magic.h>
 #include <isc/mem.h>
-#include <isc/string.h>                /* Required for memcpy. */
+#include <isc/string.h>                /* Required for memmove. */
 #include <isc/util.h>
 
 /*@{*/
@@ -132,7 +132,7 @@ resize(isc_heap_t *heap) {
        if (new_array == NULL)
                return (ISC_FALSE);
        if (heap->array != NULL) {
-               memcpy(new_array, heap->array, heap->size * sizeof(void *));
+               memmove(new_array, heap->array, heap->size * sizeof(void *));
                isc_mem_put(heap->mctx, heap->array,
                            heap->size * sizeof(void *));
        }
index 3fa0e699fa553c49c0d5e07d1b50726cce532b8b..b110179bf805ccd8450cc17212af481ac0def92a 100644 (file)
@@ -183,7 +183,7 @@ str_totext(const char *source, isc_buffer_t *target) {
        if (l > region.length)
                return (ISC_R_NOSPACE);
 
-       memcpy(region.base, source, l);
+       memmove(region.base, source, l);
        isc_buffer_add(target, l);
        return (ISC_R_SUCCESS);
 }
@@ -195,7 +195,7 @@ mem_tobuffer(isc_buffer_t *target, void *base, unsigned int length) {
        isc_buffer_availableregion(target, &tr);
        if (length > tr.length)
                return (ISC_R_NOSPACE);
-       memcpy(tr.base, base, length);
+       memmove(tr.base, base, length);
        isc_buffer_add(target, length);
        return (ISC_R_SUCCESS);
 }
index b86a7176adbcecd97a84a80ebf4b75985bac81a0..dd401dfa53ba31c73df1e3ee1c17e94217eed5c6 100644 (file)
@@ -53,7 +53,7 @@ isc_hmacmd5_init(isc_hmacmd5_t *ctx, const unsigned char *key,
                isc_md5_update(&md5ctx, key, len);
                isc_md5_final(&md5ctx, ctx->key);
        } else
-               memcpy(ctx->key, key, len);
+               memmove(ctx->key, key, len);
 
        isc_md5_init(&ctx->md5ctx);
        memset(ipad, IPAD, sizeof(ipad));
index 6feec32f6b7c2b4dfc271673f1fd51c09aa2fbc3..5976e66e290bf40e6ea631913bf7a564638a3eb2 100644 (file)
@@ -53,7 +53,7 @@ isc_hmacsha1_init(isc_hmacsha1_t *ctx, const unsigned char *key,
                isc_sha1_update(&sha1ctx, key, len);
                isc_sha1_final(&sha1ctx, ctx->key);
        } else
-               memcpy(ctx->key, key, len);
+               memmove(ctx->key, key, len);
 
        isc_sha1_init(&ctx->sha1ctx);
        memset(ipad, IPAD, sizeof(ipad));
@@ -100,7 +100,7 @@ isc_hmacsha1_sign(isc_hmacsha1_t *ctx, unsigned char *digest, size_t len) {
        isc_sha1_update(&ctx->sha1ctx, newdigest, ISC_SHA1_DIGESTLENGTH);
        isc_sha1_final(&ctx->sha1ctx, newdigest);
        isc_hmacsha1_invalidate(ctx);
-       memcpy(digest, newdigest, len);
+       memmove(digest, newdigest, len);
        memset(newdigest, 0, sizeof(newdigest));
 }
 
@@ -134,7 +134,7 @@ isc_hmacsha224_init(isc_hmacsha224_t *ctx, const unsigned char *key,
                isc_sha224_update(&sha224ctx, key, len);
                isc_sha224_final(ctx->key, &sha224ctx);
        } else
-               memcpy(ctx->key, key, len);
+               memmove(ctx->key, key, len);
 
        isc_sha224_init(&ctx->sha224ctx);
        memset(ipad, IPAD, sizeof(ipad));
@@ -179,7 +179,7 @@ isc_hmacsha224_sign(isc_hmacsha224_t *ctx, unsigned char *digest, size_t len) {
        isc_sha224_update(&ctx->sha224ctx, opad, sizeof(opad));
        isc_sha224_update(&ctx->sha224ctx, newdigest, ISC_SHA224_DIGESTLENGTH);
        isc_sha224_final(newdigest, &ctx->sha224ctx);
-       memcpy(digest, newdigest, len);
+       memmove(digest, newdigest, len);
        memset(newdigest, 0, sizeof(newdigest));
 }
 
@@ -213,7 +213,7 @@ isc_hmacsha256_init(isc_hmacsha256_t *ctx, const unsigned char *key,
                isc_sha256_update(&sha256ctx, key, len);
                isc_sha256_final(ctx->key, &sha256ctx);
        } else
-               memcpy(ctx->key, key, len);
+               memmove(ctx->key, key, len);
 
        isc_sha256_init(&ctx->sha256ctx);
        memset(ipad, IPAD, sizeof(ipad));
@@ -258,7 +258,7 @@ isc_hmacsha256_sign(isc_hmacsha256_t *ctx, unsigned char *digest, size_t len) {
        isc_sha256_update(&ctx->sha256ctx, opad, sizeof(opad));
        isc_sha256_update(&ctx->sha256ctx, newdigest, ISC_SHA256_DIGESTLENGTH);
        isc_sha256_final(newdigest, &ctx->sha256ctx);
-       memcpy(digest, newdigest, len);
+       memmove(digest, newdigest, len);
        memset(newdigest, 0, sizeof(newdigest));
 }
 
@@ -292,7 +292,7 @@ isc_hmacsha384_init(isc_hmacsha384_t *ctx, const unsigned char *key,
                isc_sha384_update(&sha384ctx, key, len);
                isc_sha384_final(ctx->key, &sha384ctx);
        } else
-               memcpy(ctx->key, key, len);
+               memmove(ctx->key, key, len);
 
        isc_sha384_init(&ctx->sha384ctx);
        memset(ipad, IPAD, sizeof(ipad));
@@ -337,7 +337,7 @@ isc_hmacsha384_sign(isc_hmacsha384_t *ctx, unsigned char *digest, size_t len) {
        isc_sha384_update(&ctx->sha384ctx, opad, sizeof(opad));
        isc_sha384_update(&ctx->sha384ctx, newdigest, ISC_SHA384_DIGESTLENGTH);
        isc_sha384_final(newdigest, &ctx->sha384ctx);
-       memcpy(digest, newdigest, len);
+       memmove(digest, newdigest, len);
        memset(newdigest, 0, sizeof(newdigest));
 }
 
@@ -371,7 +371,7 @@ isc_hmacsha512_init(isc_hmacsha512_t *ctx, const unsigned char *key,
                isc_sha512_update(&sha512ctx, key, len);
                isc_sha512_final(ctx->key, &sha512ctx);
        } else
-               memcpy(ctx->key, key, len);
+               memmove(ctx->key, key, len);
 
        isc_sha512_init(&ctx->sha512ctx);
        memset(ipad, IPAD, sizeof(ipad));
@@ -416,7 +416,7 @@ isc_hmacsha512_sign(isc_hmacsha512_t *ctx, unsigned char *digest, size_t len) {
        isc_sha512_update(&ctx->sha512ctx, opad, sizeof(opad));
        isc_sha512_update(&ctx->sha512ctx, newdigest, ISC_SHA512_DIGESTLENGTH);
        isc_sha512_final(newdigest, &ctx->sha512ctx);
-       memcpy(digest, newdigest, len);
+       memmove(digest, newdigest, len);
        memset(newdigest, 0, sizeof(newdigest));
 }
 
index 8567922836ae87e1838e409991943ef3e1223914..cb90a4ea54979384e9c319f23f6957bc2cff6a23 100644 (file)
@@ -787,7 +787,7 @@ ISC_LANG_ENDDECLS
 
 #define ISC__BUFFER_PUTMEM(_b, _base, _length) \
        do { \
-               memcpy(isc_buffer_used(_b), (_base), (_length)); \
+               memmove(isc_buffer_used(_b), (_base), (_length)); \
                (_b)->used += (_length); \
        } while (0)
 
@@ -797,7 +797,7 @@ ISC_LANG_ENDDECLS
                unsigned char *_cp; \
                _length = strlen(_source); \
                _cp = isc_buffer_used(_b); \
-               memcpy(_cp, (_source), _length); \
+               memmove(_cp, (_source), _length); \
                (_b)->used += (_length); \
        } while (0)
 
index 63431e5e792083997a6fcd733095cfac81d8e877..54949cd778936badb6e4bff621ad8d2fe4ffa66d 100644 (file)
                        (pt).family = (na)->family; \
                        (pt).bitlen = (bits); \
                        if ((pt).family == AF_INET6) { \
-                               memcpy(&(pt).add.sin6, &(na)->type.in6, \
+                               memmove(&(pt).add.sin6, &(na)->type.in6, \
                                       ((bits)+7)/8); \
                        } else \
-                               memcpy(&(pt).add.sin, &(na)->type.in, \
+                               memmove(&(pt).add.sin, &(na)->type.in, \
                                       ((bits)+7)/8); \
                } else { \
                        (pt).family = AF_UNSPEC; \
index 6bada239e0e5e69a8930cbcb15808ca0cda08a3e..d07d37b84f541bba8070dd2211b10c1a01f55a11 100644 (file)
@@ -113,7 +113,7 @@ inet_pton4(const char *src, unsigned char *dst) {
        }
        if (octets < 4)
                return (0);
-       memcpy(dst, tmp, NS_INADDRSZ);
+       memmove(dst, tmp, NS_INADDRSZ);
        return (1);
 }
 
@@ -209,6 +209,6 @@ inet_pton6(const char *src, unsigned char *dst) {
        }
        if (tp != endp)
                return (0);
-       memcpy(dst, tmp, NS_IN6ADDRSZ);
+       memmove(dst, tmp, NS_IN6ADDRSZ);
        return (1);
 }
index 88e9cd4a3898b6b516d3e1cf0beec30d294b0d3a..df3fec9aa8bfeda85cbe9b07a658553d72bdcba2 100644 (file)
@@ -75,7 +75,7 @@ grow_data(isc_lex_t *lex, size_t *remainingp, char **currp, char **prevp) {
        new = isc_mem_get(lex->mctx, lex->max_token * 2 + 1);
        if (new == NULL)
                return (ISC_R_NOMEMORY);
-       memcpy(new, lex->data, lex->max_token + 1);
+       memmove(new, lex->data, lex->max_token + 1);
        *currp = new + (*currp - lex->data);
        if (*prevp != NULL)
                *prevp = new + (*prevp - lex->data);
@@ -173,7 +173,7 @@ isc_lex_getspecials(isc_lex_t *lex, isc_lexspecials_t specials) {
 
        REQUIRE(VALID_LEX(lex));
 
-       memcpy(specials, lex->specials, 256);
+       memmove(specials, lex->specials, 256);
 }
 
 void
@@ -185,7 +185,7 @@ isc_lex_setspecials(isc_lex_t *lex, isc_lexspecials_t specials) {
 
        REQUIRE(VALID_LEX(lex));
 
-       memcpy(lex->specials, specials, 256);
+       memmove(lex->specials, specials, 256);
 }
 
 static inline isc_result_t
index c9e63cc5bfe917fbca0932a0b1d614aa0ede7837..7dd517e65d73b4af9f763435cb5c976789052f36 100644 (file)
@@ -1129,7 +1129,7 @@ sync_channellist(isc_logconfig_t *lcfg) {
        if (lcfg->channellist_count != 0) {
                bytes = lcfg->channellist_count *
                        sizeof(ISC_LIST(isc_logchannellist_t));
-               memcpy(lists, lcfg->channellists, bytes);
+               memmove(lists, lcfg->channellists, bytes);
                isc_mem_put(lctx->mctx, lcfg->channellists, bytes);
        }
 
index 2cea018c246e46814fab3efd6c22caa333794783..3aa09b387d305b3dd283130339c6688929c8fbde 100644 (file)
@@ -192,11 +192,11 @@ isc_md5_update(isc_md5_t *ctx, const unsigned char *buf, unsigned int len) {
 
        t = 64 - (t & 0x3f);    /* Space available in ctx->in (at least 1) */
        if (t > len) {
-               memcpy((unsigned char *)ctx->in + 64 - t, buf, len);
+               memmove((unsigned char *)ctx->in + 64 - t, buf, len);
                return;
        }
        /* First chunk is an odd size */
-       memcpy((unsigned char *)ctx->in + 64 - t, buf, t);
+       memmove((unsigned char *)ctx->in + 64 - t, buf, t);
        byteSwap(ctx->in, 16);
        transform(ctx->buf, ctx->in);
        buf += t;
@@ -204,7 +204,7 @@ isc_md5_update(isc_md5_t *ctx, const unsigned char *buf, unsigned int len) {
 
        /* Process data in 64-byte chunks */
        while (len >= 64) {
-               memcpy(ctx->in, buf, 64);
+               memmove(ctx->in, buf, 64);
                byteSwap(ctx->in, 16);
                transform(ctx->buf, ctx->in);
                buf += 64;
@@ -212,7 +212,7 @@ isc_md5_update(isc_md5_t *ctx, const unsigned char *buf, unsigned int len) {
        }
 
        /* Handle any remaining bytes of data. */
-       memcpy(ctx->in, buf, len);
+       memmove(ctx->in, buf, len);
 }
 
 /*!
@@ -246,6 +246,6 @@ isc_md5_final(isc_md5_t *ctx, unsigned char *digest) {
        transform(ctx->buf, ctx->in);
 
        byteSwap(ctx->buf, 4);
-       memcpy(digest, ctx->buf, 16);
+       memmove(digest, ctx->buf, 16);
        memset(ctx, 0, sizeof(isc_md5_t));      /* In case it's sensitive */
 }
index ecb04d66052bee75843f3968711d66e553fd5a45..0c0b532e9f64f0b8af106689abd47c24249da283 100644 (file)
@@ -376,9 +376,9 @@ more_basic_blocks(isc_mem_t *ctx) {
                        return (ISC_FALSE);
                }
                if (ctx->basic_table_size != 0) {
-                       memcpy(table, ctx->basic_table,
-                              ctx->basic_table_size *
-                              sizeof(unsigned char *));
+                       memmove(table, ctx->basic_table,
+                               ctx->basic_table_size *
+                                 sizeof(unsigned char *));
                        (ctx->memfree)(ctx->arg, ctx->basic_table);
                }
                ctx->basic_table = table;
@@ -1416,7 +1416,7 @@ isc__mem_reallocate(isc_mem_t *ctx, void *ptr, size_t size FLARG) {
                                oldsize -= ALIGNMENT_SIZE;
                        }
                        copysize = (oldsize > size) ? size : oldsize;
-                       memcpy(new_ptr, ptr, copysize);
+                       memmove(new_ptr, ptr, copysize);
                        isc__mem_free(ctx, ptr FLARG_PASS);
                }
        } else if (ptr != NULL)
index c7b4801f9e4be23f069688e03ecd8fcbcdedbeec..b4c33131777bc5c415178c11175aa1362d29038e 100644 (file)
@@ -340,7 +340,7 @@ isc_netaddr_fromsockaddr(isc_netaddr_t *t, const isc_sockaddr_t *s) {
                t->zone = 0;
                break;
        case AF_INET6:
-               memcpy(&t->type.in6, &s->type.sin6.sin6_addr, 16);
+               memmove(&t->type.in6, &s->type.sin6.sin6_addr, 16);
 #ifdef ISC_PLATFORM_HAVESCOPEID
                t->zone = s->type.sin6.sin6_scope_id;
 #else
@@ -349,7 +349,7 @@ isc_netaddr_fromsockaddr(isc_netaddr_t *t, const isc_sockaddr_t *s) {
                break;
 #ifdef ISC_PLATFORM_HAVESYSUNH
        case AF_UNIX:
-               memcpy(t->type.un, s->type.sunix.sun_path, sizeof(t->type.un));
+               memmove(t->type.un, s->type.sunix.sun_path, sizeof(t->type.un));
                t->zone = 0;
                break;
 #endif
@@ -429,6 +429,6 @@ isc_netaddr_fromv4mapped(isc_netaddr_t *t, const isc_netaddr_t *s) {
 
        memset(t, 0, sizeof(*t));
        t->family = AF_INET;
-       memcpy(&t->type.in, (char *)&src->type.in6 + 12, 4);
+       memmove(&t->type.in, (char *)&src->type.in6 + 12, 4);
        return;
 }
index ac211efb6a8747743f70067ec786dae54177a51a..2813aca77ab5861efd760dcd6b5d6a5a802454ba 100644 (file)
@@ -62,11 +62,11 @@ _new_prefix(isc_mem_t *mctx, isc_prefix_t **target, int family, void *dest,
 
        if (family == AF_INET6) {
                prefix->bitlen = (bitlen >= 0) ? bitlen : 128;
-               memcpy(&prefix->add.sin6, dest, 16);
+               memmove(&prefix->add.sin6, dest, 16);
        } else {
                /* AF_UNSPEC is "any" or "none"--treat it as AF_INET */
                prefix->bitlen = (bitlen >= 0) ? bitlen : 32;
-               memcpy(&prefix->add.sin, dest, 4);
+               memmove(&prefix->add.sin, dest, 4);
        }
 
        prefix->family = family;
index 023edbae5adb13dcabaede8f3512d3260bace07c..89d3b4ac81e165d3494448ae1eb4926b1e3c7274 100644 (file)
@@ -173,7 +173,7 @@ transform(isc_uint32_t state[5], const unsigned char buffer[64]) {
        INSIST(state != NULL);
 
        block = &workspace;
-       (void)memcpy(block, buffer, 64);
+       (void)memmove(block, buffer, 64);
 
        /* Copy context->state[] to working vars */
        a = state[0];
@@ -265,7 +265,7 @@ isc_sha1_update(isc_sha1_t *context, const unsigned char *data,
                context->count[1] += (len >> 29) + 1;
        j = (j >> 3) & 63;
        if ((j + len) > 63) {
-               (void)memcpy(&context->buffer[j], data, (i = 64 - j));
+               (void)memmove(&context->buffer[j], data, (i = 64 - j));
                transform(context->state, context->buffer);
                for (; i + 63 < len; i += 64)
                        transform(context->state, &data[i]);
@@ -274,7 +274,7 @@ isc_sha1_update(isc_sha1_t *context, const unsigned char *data,
                i = 0;
        }
 
-       (void)memcpy(&context->buffer[j], &data[i], len - i);
+       (void)memmove(&context->buffer[j], &data[i], len - i);
 }
 
 
index 434042308587324aa3ee5523ce4ccef271ba399e..e0ba60e7f9d9c43f3135d35e913a1a895963000e 100644 (file)
@@ -408,8 +408,8 @@ isc_sha224_init(isc_sha224_t *context) {
        if (context == (isc_sha256_t *)0) {
                return;
        }
-       memcpy(context->state, sha224_initial_hash_value,
-              ISC_SHA256_DIGESTLENGTH);
+       memmove(context->state, sha224_initial_hash_value,
+               ISC_SHA256_DIGESTLENGTH);
        memset(context->buffer, 0, ISC_SHA256_BLOCK_LENGTH);
        context->bitcount = 0;
 }
@@ -428,7 +428,7 @@ void
 isc_sha224_final(isc_uint8_t digest[], isc_sha224_t *context) {
        isc_uint8_t sha256_digest[ISC_SHA256_DIGESTLENGTH];
        isc_sha256_final(sha256_digest, (isc_sha256_t *)context);
-       memcpy(digest, sha256_digest, ISC_SHA224_DIGESTLENGTH);
+       memmove(digest, sha256_digest, ISC_SHA224_DIGESTLENGTH);
        memset(sha256_digest, 0, ISC_SHA256_DIGESTLENGTH);
 }
 
@@ -473,7 +473,7 @@ isc_sha256_init(isc_sha256_t *context) {
        if (context == (isc_sha256_t *)0) {
                return;
        }
-       memcpy(context->state, sha256_initial_hash_value,
+       memmove(context->state, sha256_initial_hash_value,
               ISC_SHA256_DIGESTLENGTH);
        memset(context->buffer, 0, ISC_SHA256_BLOCK_LENGTH);
        context->bitcount = 0;
@@ -686,7 +686,7 @@ isc_sha256_update(isc_sha256_t *context, const isc_uint8_t *data, size_t len) {
 
                if (len >= freespace) {
                        /* Fill the buffer completely and process it */
-                       memcpy(&context->buffer[usedspace], data, freespace);
+                       memmove(&context->buffer[usedspace], data, freespace);
                        context->bitcount += freespace << 3;
                        len -= freespace;
                        data += freespace;
@@ -694,7 +694,7 @@ isc_sha256_update(isc_sha256_t *context, const isc_uint8_t *data, size_t len) {
                                             (isc_uint32_t*)context->buffer);
                } else {
                        /* The buffer is not yet full */
-                       memcpy(&context->buffer[usedspace], data, len);
+                       memmove(&context->buffer[usedspace], data, len);
                        context->bitcount += len << 3;
                        /* Clean up: */
                        usedspace = freespace = 0;
@@ -705,7 +705,7 @@ isc_sha256_update(isc_sha256_t *context, const isc_uint8_t *data, size_t len) {
        }
        while (len >= ISC_SHA256_BLOCK_LENGTH) {
                /* Process as many complete blocks as we can */
-               memcpy(context->buffer, data, ISC_SHA256_BLOCK_LENGTH);
+               memmove(context->buffer, data, ISC_SHA256_BLOCK_LENGTH);
                isc_sha256_transform(context, (isc_uint32_t*)context->buffer);
                context->bitcount += ISC_SHA256_BLOCK_LENGTH << 3;
                len -= ISC_SHA256_BLOCK_LENGTH;
@@ -713,7 +713,7 @@ isc_sha256_update(isc_sha256_t *context, const isc_uint8_t *data, size_t len) {
        }
        if (len > 0U) {
                /* There's left-overs, so save 'em */
-               memcpy(context->buffer, data, len);
+               memmove(context->buffer, data, len);
                context->bitcount += len << 3;
        }
        /* Clean up: */
@@ -783,7 +783,7 @@ isc_sha256_final(isc_uint8_t digest[], isc_sha256_t *context) {
                        }
                }
 #else
-               memcpy(d, context->state, ISC_SHA256_DIGESTLENGTH);
+               memmove(d, context->state, ISC_SHA256_DIGESTLENGTH);
 #endif
        }
 
@@ -835,8 +835,8 @@ isc_sha512_init(isc_sha512_t *context) {
        if (context == (isc_sha512_t *)0) {
                return;
        }
-       memcpy(context->state, sha512_initial_hash_value,
-              ISC_SHA512_DIGESTLENGTH);
+       memmove(context->state, sha512_initial_hash_value,
+               ISC_SHA512_DIGESTLENGTH);
        memset(context->buffer, 0, ISC_SHA512_BLOCK_LENGTH);
        context->bitcount[0] = context->bitcount[1] =  0;
 }
@@ -1042,7 +1042,7 @@ isc_sha512_update(isc_sha512_t *context, const isc_uint8_t *data, size_t len) {
 
                if (len >= freespace) {
                        /* Fill the buffer completely and process it */
-                       memcpy(&context->buffer[usedspace], data, freespace);
+                       memmove(&context->buffer[usedspace], data, freespace);
                        ADDINC128(context->bitcount, freespace << 3);
                        len -= freespace;
                        data += freespace;
@@ -1050,7 +1050,7 @@ isc_sha512_update(isc_sha512_t *context, const isc_uint8_t *data, size_t len) {
                                             (isc_uint64_t*)context->buffer);
                } else {
                        /* The buffer is not yet full */
-                       memcpy(&context->buffer[usedspace], data, len);
+                       memmove(&context->buffer[usedspace], data, len);
                        ADDINC128(context->bitcount, len << 3);
                        /* Clean up: */
                        usedspace = freespace = 0;
@@ -1061,7 +1061,7 @@ isc_sha512_update(isc_sha512_t *context, const isc_uint8_t *data, size_t len) {
        }
        while (len >= ISC_SHA512_BLOCK_LENGTH) {
                /* Process as many complete blocks as we can */
-               memcpy(context->buffer, data, ISC_SHA512_BLOCK_LENGTH);
+               memmove(context->buffer, data, ISC_SHA512_BLOCK_LENGTH);
                isc_sha512_transform(context, (isc_uint64_t*)context->buffer);
                ADDINC128(context->bitcount, ISC_SHA512_BLOCK_LENGTH << 3);
                len -= ISC_SHA512_BLOCK_LENGTH;
@@ -1069,7 +1069,7 @@ isc_sha512_update(isc_sha512_t *context, const isc_uint8_t *data, size_t len) {
        }
        if (len > 0U) {
                /* There's left-overs, so save 'em */
-               memcpy(context->buffer, data, len);
+               memmove(context->buffer, data, len);
                ADDINC128(context->bitcount, len << 3);
        }
        /* Clean up: */
@@ -1144,7 +1144,7 @@ void isc_sha512_final(isc_uint8_t digest[], isc_sha512_t *context) {
                        }
                }
 #else
-               memcpy(d, context->state, ISC_SHA512_DIGESTLENGTH);
+               memmove(d, context->state, ISC_SHA512_DIGESTLENGTH);
 #endif
        }
 
@@ -1194,8 +1194,8 @@ isc_sha384_init(isc_sha384_t *context) {
        if (context == (isc_sha384_t *)0) {
                return;
        }
-       memcpy(context->state, sha384_initial_hash_value,
-              ISC_SHA512_DIGESTLENGTH);
+       memmove(context->state, sha384_initial_hash_value,
+               ISC_SHA512_DIGESTLENGTH);
        memset(context->buffer, 0, ISC_SHA384_BLOCK_LENGTH);
        context->bitcount[0] = context->bitcount[1] = 0;
 }
@@ -1232,7 +1232,7 @@ isc_sha384_final(isc_uint8_t digest[], isc_sha384_t *context) {
                        }
                }
 #else
-               memcpy(d, context->state, ISC_SHA384_DIGESTLENGTH);
+               memmove(d, context->state, ISC_SHA384_DIGESTLENGTH);
 #endif
        }
 
index 4c3da2f67225e2d39cca681454b99e548cd02f1f..ccd16b9d85775cc309ba52357852efd5fbc2e28e 100644 (file)
@@ -332,7 +332,7 @@ isc_sockaddr_v6fromin(isc_sockaddr_t *sockaddr, const struct in_addr *ina,
 #endif
        sockaddr->type.sin6.sin6_addr.s6_addr[10] = 0xff;
        sockaddr->type.sin6.sin6_addr.s6_addr[11] = 0xff;
-       memcpy(&sockaddr->type.sin6.sin6_addr.s6_addr[12], ina, 4);
+       memmove(&sockaddr->type.sin6.sin6_addr.s6_addr[12], ina, 4);
        sockaddr->type.sin6.sin6_port = htons(port);
        sockaddr->length = sizeof(sockaddr->type.sin6);
        ISC_LINK_INIT(sockaddr, link);
@@ -386,7 +386,7 @@ isc_sockaddr_fromnetaddr(isc_sockaddr_t *sockaddr, const isc_netaddr_t *na,
 #ifdef ISC_PLATFORM_HAVESALEN
                sockaddr->type.sin6.sin6_len = sizeof(sockaddr->type.sin6);
 #endif
-               memcpy(&sockaddr->type.sin6.sin6_addr, &na->type.in6, 16);
+               memmove(&sockaddr->type.sin6.sin6_addr, &na->type.in6, 16);
 #ifdef ISC_PLATFORM_HAVESCOPEID
                sockaddr->type.sin6.sin6_scope_id = isc_netaddr_getzone(na);
 #endif
index 8b624b2d478de9a74043416e40f9aa9d65432007..7ab192944c9a69ed890c7ee5b1ac2e32ba080223 100644 (file)
@@ -275,8 +275,8 @@ copy_counters(isc_stats_t *stats) {
        }
 #else
        UNUSED(i);
-       memcpy(stats->copiedcounters, stats->counters,
-              stats->ncounters * sizeof(isc_stat_t));
+       memmove(stats->copiedcounters, stats->counters,
+               stats->ncounters * sizeof(isc_stat_t));
 #endif
 
 #ifdef ISC_RWLOCK_USEATOMIC
index cba517c568f96d58cbf58b735e7cf4ba9a8fb6c6..0e1b90465ec6dc7fb687c0ca4f80defcd382bbb3 100644 (file)
@@ -188,7 +188,7 @@ isc_string_regiondup(isc_mem_t *mctx, const isc_region_t *source) {
 
        target = (char *) isc_mem_allocate(mctx, source->length + 1);
        if (target != NULL) {
-               memcpy(source->base, target, source->length);
+               memmove(source->base, target, source->length);
                target[source->length] = '\0';
        }
 
index 836d7b67abc744aaa6f99a5d2ac02bf82e840054..c4aa3dce22c5a9d1136c8e87a78eb8dd45ecd9f7 100644 (file)
@@ -963,7 +963,7 @@ ATF_TC_BODY(isc_hmacsha1, tc) {
        hash_test_key_t *test_key = test_keys;
 
        while (testcase->input != NULL && testcase->result != NULL) {
-               memcpy(buffer, test_key->key, test_key->len);
+               memmove(buffer, test_key->key, test_key->len);
                isc_hmacsha1_init(&hmacsha1, buffer, test_key->len);
                isc_hmacsha1_update(&hmacsha1,
                                    (const isc_uint8_t *) testcase->input,
@@ -1126,7 +1126,7 @@ ATF_TC_BODY(isc_hmacsha224, tc) {
        hash_test_key_t *test_key = test_keys;
 
        while (testcase->input != NULL && testcase->result != NULL) {
-               memcpy(buffer, test_key->key, test_key->len);
+               memmove(buffer, test_key->key, test_key->len);
                isc_hmacsha224_init(&hmacsha224, buffer, test_key->len);
                isc_hmacsha224_update(&hmacsha224,
                                      (const isc_uint8_t *) testcase->input,
@@ -1289,7 +1289,7 @@ ATF_TC_BODY(isc_hmacsha256, tc) {
        hash_test_key_t *test_key = test_keys;
 
        while (testcase->input != NULL && testcase->result != NULL) {
-               memcpy(buffer, test_key->key, test_key->len);
+               memmove(buffer, test_key->key, test_key->len);
                isc_hmacsha256_init(&hmacsha256, buffer, test_key->len);
                isc_hmacsha256_update(&hmacsha256,
                                      (const isc_uint8_t *) testcase->input,
@@ -1458,7 +1458,7 @@ ATF_TC_BODY(isc_hmacsha384, tc) {
        hash_test_key_t *test_key = test_keys;
 
        while (testcase->input != NULL && testcase->result != NULL) {
-               memcpy(buffer, test_key->key, test_key->len);
+               memmove(buffer, test_key->key, test_key->len);
                isc_hmacsha384_init(&hmacsha384, buffer, test_key->len);
                isc_hmacsha384_update(&hmacsha384,
                                      (const isc_uint8_t *) testcase->input,
@@ -1627,7 +1627,7 @@ ATF_TC_BODY(isc_hmacsha512, tc) {
        hash_test_key_t *test_key = test_keys;
 
        while (testcase->input != NULL && testcase->result != NULL) {
-               memcpy(buffer, test_key->key, test_key->len);
+               memmove(buffer, test_key->key, test_key->len);
                isc_hmacsha512_init(&hmacsha512, buffer, test_key->len);
                isc_hmacsha512_update(&hmacsha512,
                                      (const isc_uint8_t *) testcase->input,
@@ -1770,7 +1770,7 @@ ATF_TC_BODY(isc_hmacmd5, tc) {
        hash_test_key_t *test_key = test_keys;
 
        while (testcase->input != NULL && testcase->result != NULL) {
-               memcpy(buffer, test_key->key, test_key->len);
+               memmove(buffer, test_key->key, test_key->len);
                isc_hmacmd5_init(&hmacmd5, buffer, test_key->len);
                isc_hmacmd5_update(&hmacmd5,
                                   (const isc_uint8_t *) testcase->input,
index 582fc23df1790d3b3a9e98a470d98be0ceff40c0..440ffc740ffa10fdb796e8cedb5da7168e721519 100644 (file)
@@ -408,7 +408,7 @@ isc_file_progname(const char *filename, char *buf, size_t buflen) {
 
        if (len > buflen)
                return (ISC_R_NOSPACE);
-       memcpy(buf, base, len);
+       memmove(buf, base, len);
 
        return (ISC_R_SUCCESS);
 }
index bddd82a23178f4768b3d0ae73f8091873de35d66..abb71eff6ddfbcc915137584a63bd2c52da545d6 100644 (file)
@@ -159,7 +159,7 @@ internal_current(isc_interfaceiter_t *iter) {
                namelen = sizeof(iter->current.name) - 1;
 
        memset(iter->current.name, 0, sizeof(iter->current.name));
-       memcpy(iter->current.name, ifa->ifa_name, namelen);
+       memmove(iter->current.name, ifa->ifa_name, namelen);
 
        iter->current.flags = 0;
 
index 1efb36d3238f0c5588a8890968762b728e7c1a89..e91d6505f8c75def8dfa5377cf5e429afcdb0237 100644 (file)
@@ -398,7 +398,7 @@ isc_interfaceiter_create(isc_mem_t *mctx, isc_interfaceiter_t **iterp) {
 static void
 get_inaddr(isc_netaddr_t *dst, struct in_addr *src) {
        dst->family = AF_INET;
-       memcpy(&dst->type.in, src, sizeof(struct in_addr));
+       memmove(&dst->type.in, src, sizeof(struct in_addr));
 }
 
 static isc_result_t
@@ -454,7 +454,7 @@ internal_current4(isc_interfaceiter_t *iter) {
        ifrp = (struct ifreq *)((char *) iter->ifc.ifc_req + iter->pos);
 
        memset(&ifreq, 0, sizeof(ifreq));
-       memcpy(&ifreq, ifrp, sizeof(ifreq));
+       memmove(&ifreq, ifrp, sizeof(ifreq));
 
        family = ifreq.ifr_addr.sa_family;
 #if defined(ISC_PLATFORM_HAVEIPV6)
@@ -469,7 +469,7 @@ internal_current4(isc_interfaceiter_t *iter) {
 
        INSIST(sizeof(ifreq.ifr_name) <= sizeof(iter->current.name));
        memset(iter->current.name, 0, sizeof(iter->current.name));
-       memcpy(iter->current.name, ifreq.ifr_name, sizeof(ifreq.ifr_name));
+       memmove(iter->current.name, ifreq.ifr_name, sizeof(ifreq.ifr_name));
 
        get_addr(family, &iter->current.address,
                 (struct sockaddr *)&ifrp->ifr_addr, ifreq.ifr_name);
@@ -524,8 +524,8 @@ internal_current4(isc_interfaceiter_t *iter) {
 
 #if !defined(ISC_PLATFORM_HAVEIF_LADDRREQ) && defined(SIOCGLIFADDR)
        memset(&lifreq, 0, sizeof(lifreq));
-       memcpy(lifreq.lifr_name, iter->current.name, sizeof(lifreq.lifr_name));
-       memcpy(&lifreq.lifr_addr, &iter->current.address.type.in6,
+       memmove(lifreq.lifr_name, iter->current.name, sizeof(lifreq.lifr_name));
+       memmove(&lifreq.lifr_addr, &iter->current.address.type.in6,
               sizeof(iter->current.address.type.in6));
 
        if (ioctl(iter->socket, SIOCGLIFADDR, &lifreq) < 0) {
@@ -599,7 +599,7 @@ internal_current4(isc_interfaceiter_t *iter) {
         * Get the network mask.
         */
        memset(&ifreq, 0, sizeof(ifreq));
-       memcpy(&ifreq, ifrp, sizeof(ifreq));
+       memmove(&ifreq, ifrp, sizeof(ifreq));
        /*
         * Ignore the HP/UX warning about "integer overflow during
         * conversion.  It comes from its own macro definition,
@@ -637,7 +637,7 @@ internal_current6(isc_interfaceiter_t *iter) {
        ifrp = (struct LIFREQ *)((char *) iter->lifc.lifc_req + iter->pos6);
 
        memset(&lifreq, 0, sizeof(lifreq));
-       memcpy(&lifreq, ifrp, sizeof(lifreq));
+       memmove(&lifreq, ifrp, sizeof(lifreq));
 
        family = lifreq.lifr_addr.ss_family;
 #ifdef ISC_PLATFORM_HAVEIPV6
@@ -652,7 +652,7 @@ internal_current6(isc_interfaceiter_t *iter) {
 
        INSIST(sizeof(lifreq.lifr_name) <= sizeof(iter->current.name));
        memset(iter->current.name, 0, sizeof(iter->current.name));
-       memcpy(iter->current.name, lifreq.lifr_name, sizeof(lifreq.lifr_name));
+       memmove(iter->current.name, lifreq.lifr_name, sizeof(lifreq.lifr_name));
 
        get_addr(family, &iter->current.address,
                 (struct sockaddr *)&lifreq.lifr_addr, lifreq.lifr_name);
@@ -739,7 +739,7 @@ internal_current6(isc_interfaceiter_t *iter) {
         * Get the network mask.  Netmask already zeroed.
         */
        memset(&lifreq, 0, sizeof(lifreq));
-       memcpy(&lifreq, ifrp, sizeof(lifreq));
+       memmove(&lifreq, ifrp, sizeof(lifreq));
 
 #ifdef lifr_addrlen
        /*
index 9d5bf6d9e7c0e01bd27bfcf28606e1088456d5dd..209325cd0cec7845ade5b2a602e92a40e6f97bc2 100644 (file)
@@ -171,7 +171,7 @@ internal_current(isc_interfaceiter_t *iter) {
                        namelen = sizeof(iter->current.name) - 1;
 
                memset(iter->current.name, 0, sizeof(iter->current.name));
-               memcpy(iter->current.name, sdl->sdl_data, namelen);
+               memmove(iter->current.name, sdl->sdl_data, namelen);
 
                iter->current.flags = 0;
 
index b22462b616fb0305326330f7fadc38a47048e635..7d2d5003d3897b6793cdcf46f98b3534864dc194 100644 (file)
@@ -79,14 +79,14 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src,
        dst->family = family;
        switch (family) {
        case AF_INET:
-               memcpy(&dst->type.in,
-                      &((struct sockaddr_in *) src)->sin_addr,
-                      sizeof(struct in_addr));
+               memmove(&dst->type.in,
+                       &((struct sockaddr_in *) src)->sin_addr,
+                       sizeof(struct in_addr));
                break;
        case AF_INET6:
                sa6 = (struct sockaddr_in6 *)src;
-               memcpy(&dst->type.in6, &sa6->sin6_addr,
-                      sizeof(struct in6_addr));
+               memmove(&dst->type.in6, &sa6->sin6_addr,
+                       sizeof(struct in6_addr));
 #ifdef ISC_PLATFORM_HAVESCOPEID
                if (sa6->sin6_scope_id != 0)
                        isc_netaddr_setzone(dst, sa6->sin6_scope_id);
@@ -105,8 +105,8 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src,
                        if (IN6_IS_ADDR_LINKLOCAL(&sa6->sin6_addr)) {
                                isc_uint16_t zone16;
 
-                               memcpy(&zone16, &sa6->sin6_addr.s6_addr[2],
-                                      sizeof(zone16));
+                               memmove(&zone16, &sa6->sin6_addr.s6_addr[2],
+                                       sizeof(zone16));
                                zone16 = ntohs(zone16);
                                if (zone16 != 0) {
                                        /* the zone ID is embedded */
@@ -252,7 +252,7 @@ isc_interfaceiter_current(isc_interfaceiter_t *iter,
                          isc_interface_t *ifdata)
 {
        REQUIRE(iter->result == ISC_R_SUCCESS);
-       memcpy(ifdata, &iter->current, sizeof(*ifdata));
+       memmove(ifdata, &iter->current, sizeof(*ifdata));
        return (ISC_R_SUCCESS);
 }
 
index 77ef50f6c6da8b0443e7c43412e059a2b2b8f728..33f8943977efb9962b4fe6a8ccd11889393019c5 100644 (file)
@@ -1084,8 +1084,8 @@ process_cmsg(isc_socket_t *sock, struct msghdr *msg, isc_socketevent_t *dev) {
                    && cmsgp->cmsg_type == IPV6_PKTINFO) {
 
                        pktinfop = (struct in6_pktinfo *)CMSG_DATA(cmsgp);
-                       memcpy(&dev->pktinfo, pktinfop,
-                              sizeof(struct in6_pktinfo));
+                       memmove(&dev->pktinfo, pktinfop,
+                               sizeof(struct in6_pktinfo));
                        dev->attributes |= ISC_SOCKEVENTATTR_PKTINFO;
                        socket_log(sock, NULL, TRACE,
                                   isc_msgcat, ISC_MSGSET_SOCKET,
@@ -1103,7 +1103,7 @@ process_cmsg(isc_socket_t *sock, struct msghdr *msg, isc_socketevent_t *dev) {
                    && cmsgp->cmsg_type == SCM_TIMESTAMP) {
                        struct timeval tv;
                        timevalp = CMSG_DATA(cmsgp);
-                       memcpy(&tv, timevalp, sizeof(tv));
+                       memmove(&tv, timevalp, sizeof(tv));
                        dev->timestamp.seconds = tv.tv_sec;
                        dev->timestamp.nanoseconds = tv.tv_usec * 1000;
                        dev->attributes |= ISC_SOCKEVENTATTR_TIMESTAMP;
@@ -1229,7 +1229,7 @@ build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev,
                cmsgp->cmsg_type = IPV6_PKTINFO;
                cmsgp->cmsg_len = cmsg_len(sizeof(struct in6_pktinfo));
                pktinfop = (struct in6_pktinfo *)CMSG_DATA(cmsgp);
-               memcpy(pktinfop, &dev->pktinfo, sizeof(struct in6_pktinfo));
+               memmove(pktinfop, &dev->pktinfo, sizeof(struct in6_pktinfo));
 #if defined(IPV6_USE_MIN_MTU)
                /*
                 * Set IPV6_USE_MIN_MTU as a per packet option as FreeBSD
@@ -1244,7 +1244,7 @@ build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev,
                cmsgp->cmsg_level = IPPROTO_IPV6;
                cmsgp->cmsg_type = IPV6_USE_MIN_MTU;
                cmsgp->cmsg_len = cmsg_len(sizeof(use_min_mtu));
-               memcpy(CMSG_DATA(cmsgp), &use_min_mtu, sizeof(use_min_mtu));
+               memmove(CMSG_DATA(cmsgp), &use_min_mtu, sizeof(use_min_mtu));
 #endif
        }
 #endif /* USE_CMSG && ISC_PLATFORM_HAVEIPV6 */
@@ -3577,10 +3577,10 @@ watcher(void *uap) {
                        cc = ioctl(manager->devpoll_fd, DP_POLL, &dvp);
 #elif defined(USE_SELECT)
                        LOCK(&manager->lock);
-                       memcpy(manager->read_fds_copy, manager->read_fds,
-                              manager->fd_bufsize);
-                       memcpy(manager->write_fds_copy, manager->write_fds,
-                              manager->fd_bufsize);
+                       memmove(manager->read_fds_copy, manager->read_fds,
+                               manager->fd_bufsize);
+                       memmove(manager->write_fds_copy, manager->write_fds,
+                               manager->fd_bufsize);
                        maxfd = manager->maxfd + 1;
                        UNLOCK(&manager->lock);
 
@@ -5500,10 +5500,10 @@ isc__socketmgr_waitevents(struct timeval *tvp, isc_socketwait_t **swaitp) {
        swait_private.nevents = ioctl(socketmgr->devpoll_fd, DP_POLL, &dvp);
        n = swait_private.nevents;
 #elif defined(USE_SELECT)
-       memcpy(socketmgr->read_fds_copy, socketmgr->read_fds,
-              socketmgr->fd_bufsize);
-       memcpy(socketmgr->write_fds_copy, socketmgr->write_fds,
-              socketmgr->fd_bufsize);
+       memmove(socketmgr->read_fds_copy, socketmgr->read_fds,
+               socketmgr->fd_bufsize);
+       memmove(socketmgr->write_fds_copy, socketmgr->write_fds,
+               socketmgr->fd_bufsize);
 
        swait_private.readset = socketmgr->read_fds_copy;
        swait_private.writeset = socketmgr->write_fds_copy;
index 7565938394f07f9b2882b2c5a1596af516440e17..cb7a85856c405e7ddd546cb05bf032ed273c7d16 100644 (file)
@@ -88,14 +88,14 @@ get_addr(unsigned int family, isc_netaddr_t *dst, struct sockaddr *src) {
        dst->family = family;
        switch (family) {
        case AF_INET:
-               memcpy(&dst->type.in,
-                      &((struct sockaddr_in *) src)->sin_addr,
-                      sizeof(struct in_addr));
+               memmove(&dst->type.in,
+                       &((struct sockaddr_in *) src)->sin_addr,
+                       sizeof(struct in_addr));
                break;
        case    AF_INET6:
-               memcpy(&dst->type.in6,
-                      &((struct sockaddr_in6 *) src)->sin6_addr,
-                      sizeof(struct in6_addr));
+               memmove(&dst->type.in6,
+                       &((struct sockaddr_in6 *) src)->sin6_addr,
+                       sizeof(struct in6_addr));
                dst->zone = ((struct sockaddr_in6 *) src)->sin6_scope_id;
                break;
        default:
@@ -423,7 +423,7 @@ internal_next(isc_interfaceiter_t *iter) {
                return (ISC_R_NOMORE);
 
        memset(&(iter->IFData), 0, sizeof(INTERFACE_INFO));
-       memcpy(&(iter->IFData), iter->pos4, sizeof(INTERFACE_INFO));
+       memmove(&(iter->IFData), iter->pos4, sizeof(INTERFACE_INFO));
        iter->numIF++;
 
        return (ISC_R_SUCCESS);
@@ -441,7 +441,7 @@ isc_result_t
 isc_interfaceiter_current(isc_interfaceiter_t *iter,
                          isc_interface_t *ifdata) {
        REQUIRE(iter->result == ISC_R_SUCCESS);
-       memcpy(ifdata, &iter->current, sizeof(*ifdata));
+       memmove(ifdata, &iter->current, sizeof(*ifdata));
        return (ISC_R_SUCCESS);
 }
 
index fef0b97d2b7b5a6e965eb2faed7b00fa057fe131..1f1c2f75c919ba1d01ae3f7f40f999df477c4161 100644 (file)
@@ -950,7 +950,7 @@ build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev,
 
        memset(msg, 0, sizeof(*msg));
 
-       memcpy(&msg->to_addr, &dev->address.type, dev->address.length);
+       memmove(&msg->to_addr, &dev->address.type, dev->address.length);
        msg->to_addr_len = dev->address.length;
 
        buffer = ISC_LIST_HEAD(dev->bufferlist);
@@ -972,7 +972,7 @@ build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev,
                   "alloc_buffer %p %d %p %d", cpbuffer, sizeof(buflist_t),
                   cpbuffer->buf, write_count);
 
-               memcpy(cpbuffer->buf,(dev->region.base + dev->n), write_count);
+               memmove(cpbuffer->buf,(dev->region.base + dev->n), write_count);
                cpbuffer->buflen = write_count;
                ISC_LIST_ENQUEUE(lpo->bufferlist, cpbuffer, link);
                iov[0].buf = cpbuffer->buf;
@@ -1012,7 +1012,7 @@ build_msghdr_send(isc_socket_t *sock, isc_socketevent_t *dev,
                           "alloc_buffer %p %d %p %d", cpbuffer, sizeof(buflist_t),
                           cpbuffer->buf, write_count);
 
-                       memcpy(cpbuffer->buf,(used.base + skip_count), uselen);
+                       memmove(cpbuffer->buf,(used.base + skip_count), uselen);
                        cpbuffer->buflen = uselen;
                        iov[iovcount].buf = cpbuffer->buf;
                        iov[iovcount].len = used.length - skip_count;
@@ -1215,8 +1215,8 @@ fill_recv(isc_socket_t *sock, isc_socketevent_t *dev) {
 
        if (sock->type == isc_sockettype_udp) {
                dev->address.length = sock->recvbuf.from_addr_len;
-               memcpy(&dev->address.type, &sock->recvbuf.from_addr,
-                   sock->recvbuf.from_addr_len);
+               memmove(&dev->address.type, &sock->recvbuf.from_addr,
+                       sock->recvbuf.from_addr_len);
                if (isc_sockaddr_getport(&dev->address) == 0) {
                        if (isc_log_wouldlog(isc_lctx, IOEVENT_LEVEL)) {
                                socket_log(__LINE__, sock, &dev->address, IOEVENT,
@@ -1242,8 +1242,10 @@ fill_recv(isc_socket_t *sock, isc_socketevent_t *dev) {
                        REQUIRE(ISC_BUFFER_VALID(buffer));
                        if (isc_buffer_availablelength(buffer) > 0) {
                                isc_buffer_availableregion(buffer, &r);
-                               copylen = min(r.length, sock->recvbuf.remaining);
-                               memcpy(r.base, sock->recvbuf.consume_position, copylen);
+                               copylen = min(r.length,
+                                             sock->recvbuf.remaining);
+                               memmove(r.base, sock->recvbuf.consume_position,
+                                       copylen);
                                sock->recvbuf.consume_position += copylen;
                                sock->recvbuf.remaining -= copylen;
                                isc_buffer_add(buffer, copylen);
@@ -1253,7 +1255,8 @@ fill_recv(isc_socket_t *sock, isc_socketevent_t *dev) {
                }
        } else { // Single-buffer receive
                copylen = min(dev->region.length - dev->n, sock->recvbuf.remaining);
-               memcpy(dev->region.base + dev->n, sock->recvbuf.consume_position, copylen);
+               memmove(dev->region.base + dev->n,
+                       sock->recvbuf.consume_position, copylen);
                sock->recvbuf.consume_position += copylen;
                sock->recvbuf.remaining -= copylen;
                dev->n += copylen;
@@ -2012,7 +2015,7 @@ internal_accept(isc_socket_t *sock, IoCompletionInfo *lpo, int accept_errno) {
                sizeof(SOCKADDR_STORAGE) + 16, sizeof(SOCKADDR_STORAGE) + 16,
                (LPSOCKADDR *)&localaddr, &localaddr_len,
                (LPSOCKADDR *)&remoteaddr, &remoteaddr_len);
-       memcpy(&adev->address.type, remoteaddr, remoteaddr_len);
+       memmove(&adev->address.type, remoteaddr, remoteaddr_len);
        adev->address.length = remoteaddr_len;
        nsock->address = adev->address;
        nsock->pf = adev->address.type.sa.sa_family;
index 2e36b6e32dc039461f7ca43ce46f73fa5b8d03c6..ccc17335fb660f8f6dd7a75534867343d11e4be5 100644 (file)
 
 #define GET_MEM(v, c, w) \
        do { \
-               memcpy(v, w, c); \
+               memmove(v, w, c); \
                w += c; \
        } while (0)
 
 
 #define PUT_MEM(s, c, w) \
        do { \
-               memcpy(w, s, c); \
+               memmove(w, s, c); \
                w += c; \
        } while (0)
 
index e96536dfce5d40bcd52a36fe0cb4fb3e79b8edb1..44efd908db96d8e6b337ce81c0b6c51e19aea455 100644 (file)
@@ -112,7 +112,7 @@ isccc_sexpr_frombinary(const isccc_region_t *region)
        }
        sexpr->value.as_region.rend = sexpr->value.as_region.rstart +
                region_size;
-       memcpy(sexpr->value.as_region.rstart, region->rstart, region_size);
+       memmove(sexpr->value.as_region.rstart, region->rstart, region_size);
        /*
         * NUL terminate.
         */
index da90a7c218c786c85b7c39775fd2e414158658a0..f58f97640740a901dff02dd0e509bcc1fde93210 100644 (file)
@@ -681,7 +681,7 @@ create_string(cfg_parser_t *pctx, const char *contents, const cfg_type_t *type,
                isc_mem_put(pctx->mctx, obj, sizeof(*obj));
                return (ISC_R_NOMEMORY);
        }
-       memcpy(obj->value.string.base, contents, len);
+       memmove(obj->value.string.base, contents, len);
        obj->value.string.base[len] = '\0';
 
        *ret = obj;
@@ -1601,7 +1601,7 @@ parse_token(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
                goto cleanup;
        }
        obj->value.string.length = r.length;
-       memcpy(obj->value.string.base, r.base, r.length);
+       memmove(obj->value.string.base, r.base, r.length);
        obj->value.string.base[r.length] = '\0';
        *ret = obj;
        return (result);
index 0b9eac2bc0ff81ee8d0f60624adae0dcb0c68df0..519de136e40efcadf34e0313a48bec2008203bc6 100644 (file)
@@ -295,8 +295,8 @@ context_connect(lwres_context_t *ctx) {
        int domain;
 
        if (ctx->confdata.lwnext != 0) {
-               memcpy(&ctx->address, &ctx->confdata.lwservers[0],
-                      sizeof(lwres_addr_t));
+               memmove(&ctx->address, &ctx->confdata.lwservers[0],
+                       sizeof(lwres_addr_t));
                LWRES_LINK_INIT(&ctx->address, link);
        } else {
                /* The default is the IPv4 loopback address 127.0.0.1. */
@@ -310,16 +310,16 @@ context_connect(lwres_context_t *ctx) {
        }
 
        if (ctx->address.family == LWRES_ADDRTYPE_V4) {
-               memcpy(&sin.sin_addr, ctx->address.address,
-                      sizeof(sin.sin_addr));
+               memmove(&sin.sin_addr, ctx->address.address,
+                       sizeof(sin.sin_addr));
                sin.sin_port = htons(lwres_udp_port);
                sin.sin_family = AF_INET;
                sa = (struct sockaddr *)&sin;
                salen = sizeof(sin);
                domain = PF_INET;
        } else if (ctx->address.family == LWRES_ADDRTYPE_V6) {
-               memcpy(&sin6.sin6_addr, ctx->address.address,
-                      sizeof(sin6.sin6_addr));
+               memmove(&sin6.sin6_addr, ctx->address.address,
+                       sizeof(sin6.sin6_addr));
                sin6.sin6_port = htons(lwres_udp_port);
                sin6.sin6_family = AF_INET6;
                sa = (struct sockaddr *)&sin6;
index 581c4b81a20b5fe6e4d4b76119e19c68df6ddb21..eac948b212198d573163c1e62de8e7f336a2b2e4 100644 (file)
@@ -392,7 +392,7 @@ lwres_getaddrinfo(const char *hostname, const char *servname,
                                 * Convert to a V4 mapped address.
                                 */
                                struct in6_addr *a6 = (struct in6_addr *)abuf;
-                               memcpy(&a6->s6_addr[12], &a6->s6_addr[0], 4);
+                               memmove(&a6->s6_addr[12], &a6->s6_addr[0], 4);
                                memset(&a6->s6_addr[10], 0xff, 2);
                                memset(&a6->s6_addr[0], 0, 10);
                                goto inet6_addr;
@@ -427,7 +427,7 @@ lwres_getaddrinfo(const char *hostname, const char *servname,
                        ai_list = ai;
                        ai->ai_socktype = socktype;
                        SIN(ai->ai_addr)->sin_port = port;
-                       memcpy((char *)ai->ai_addr + addroff, abuf, addrsize);
+                       memmove((char *)ai->ai_addr + addroff, abuf, addrsize);
                        if (flags & AI_CANONNAME) {
 #if defined(LWRES_HAVE_SIN6_SCOPE_ID)
                                if (ai->ai_family == AF_INET6)
@@ -579,7 +579,7 @@ add_ipv4(const char *hostname, int flags, struct addrinfo **aip,
                *aip = ai;
                ai->ai_socktype = socktype;
                SIN(ai->ai_addr)->sin_port = port;
-               memcpy(&SIN(ai->ai_addr)->sin_addr, v4_loop, 4);
+               memmove(&SIN(ai->ai_addr)->sin_addr, v4_loop, 4);
        } else {
                lwres = lwres_getaddrsbyname(lwrctx, hostname,
                                             LWRES_ADDRTYPE_V4, &by);
@@ -597,8 +597,8 @@ add_ipv4(const char *hostname, int flags, struct addrinfo **aip,
                        *aip = ai;
                        ai->ai_socktype = socktype;
                        SIN(ai->ai_addr)->sin_port = port;
-                       memcpy(&SIN(ai->ai_addr)->sin_addr,
-                              addr->address, 4);
+                       memmove(&SIN(ai->ai_addr)->sin_addr,
+                               addr->address, 4);
                        if (flags & AI_CANONNAME) {
                                ai->ai_canonname = strdup(by->realname);
                                if (ai->ai_canonname == NULL)
@@ -643,7 +643,7 @@ add_ipv6(const char *hostname, int flags, struct addrinfo **aip,
                *aip = ai;
                ai->ai_socktype = socktype;
                SIN6(ai->ai_addr)->sin6_port = port;
-               memcpy(&SIN6(ai->ai_addr)->sin6_addr, v6_loop, 16);
+               memmove(&SIN6(ai->ai_addr)->sin6_addr, v6_loop, 16);
        } else {
                lwres = lwres_getaddrsbyname(lwrctx, hostname,
                                             LWRES_ADDRTYPE_V6, &by);
@@ -661,8 +661,8 @@ add_ipv6(const char *hostname, int flags, struct addrinfo **aip,
                        *aip = ai;
                        ai->ai_socktype = socktype;
                        SIN6(ai->ai_addr)->sin6_port = port;
-                       memcpy(&SIN6(ai->ai_addr)->sin6_addr,
-                              addr->address, 16);
+                       memmove(&SIN6(ai->ai_addr)->sin6_addr,
+                               addr->address, 16);
                        if (flags & AI_CANONNAME) {
                                ai->ai_canonname = strdup(by->realname);
                                if (ai->ai_canonname == NULL)
index 1a1efd4653057b27a0da06b642afc6e0a278100a..06b60a86d1ca7cede4721b9b996dce12b6388fea 100644 (file)
@@ -331,7 +331,7 @@ copytobuf(struct hostent *he, struct hostent *hptr, char *buf, int buflen) {
         */
         hptr->h_addr_list = ptr;
         for (i = 0; he->h_addr_list[i]; i++, ptr++) {
-                memcpy(cp, he->h_addr_list[i], n);
+                memmove(cp, he->h_addr_list[i], n);
                 hptr->h_addr_list[i] = cp;
                 cp += n;
         }
index 4055f54ef0e9b61f165c6c80545e40f381aa32a8..c5862032d1b93a207cb4b092c4bfbc623dcb9d5c 100644 (file)
@@ -420,7 +420,7 @@ lwres_getipnodebyaddr(const void *src, size_t len, int af, int *error_num) {
                /*
                 * Restore original address.
                 */
-               memcpy(he2->h_addr, src, len);
+               memmove(he2->h_addr, src, len);
                return (he2);
        }
 
@@ -595,7 +595,7 @@ scan_interfaces6(int *have_v4, int *have_v6) {
        for (cp = buf;
             (*have_v4 == 0 || *have_v6 == 0) && cp < cplim;
             cp += cpsize) {
-               memcpy(&lifreq, cp, sizeof(lifreq));
+               memmove(&lifreq, cp, sizeof(lifreq));
 #ifdef LWRES_PLATFORM_HAVESALEN
 #ifdef FIX_ZERO_SA_LEN
                if (lifreq.lifr_addr.sa_len == 0)
@@ -620,10 +620,10 @@ scan_interfaces6(int *have_v4, int *have_v6) {
                switch (lifreq.lifr_addr.ss_family) {
                case AF_INET:
                        if (*have_v4 == 0) {
-                               memcpy(&in4,
-                                      &((struct sockaddr_in *)
-                                      &lifreq.lifr_addr)->sin_addr,
-                                      sizeof(in4));
+                               memmove(&in4,
+                                       &((struct sockaddr_in *)
+                                         &lifreq.lifr_addr)->sin_addr,
+                                       sizeof(in4));
                                if (in4.s_addr == INADDR_ANY)
                                        break;
                                n = ioctl(s, SIOCGLIFFLAGS, (char *)&lifreq);
@@ -636,10 +636,10 @@ scan_interfaces6(int *have_v4, int *have_v6) {
                        break;
                case AF_INET6:
                        if (*have_v6 == 0) {
-                               memcpy(&in6,
-                                      &((struct sockaddr_in6 *)
-                                      &lifreq.lifr_addr)->sin6_addr,
-                                      sizeof(in6));
+                               memmove(&in6,
+                                       &((struct sockaddr_in6 *)
+                                         &lifreq.lifr_addr)->sin6_addr,
+                                       sizeof(in6));
                                if (memcmp(&in6, &in6addr_any,
                                           sizeof(in6)) == 0)
                                        break;
@@ -760,7 +760,7 @@ scan_interfaces(int *have_v4, int *have_v6) {
        for (cp = buf;
             (*have_v4 == 0 || *have_v6 == 0) && cp < cplim;
             cp += cpsize) {
-               memcpy(&u.ifreq, cp, sizeof(u.ifreq));
+               memmove(&u.ifreq, cp, sizeof(u.ifreq));
 #ifdef LWRES_PLATFORM_HAVESALEN
 #ifdef FIX_ZERO_SA_LEN
                if (u.ifreq.ifr_addr.sa_len == 0)
@@ -775,7 +775,7 @@ scan_interfaces(int *have_v4, int *have_v6) {
                cpsize = sizeof(u.ifreq.ifr_name) + u.ifreq.ifr_addr.sa_len;
 #endif /* HAVE_MINIMUM_IFREQ */
                if (cpsize > sizeof(u.ifreq) && cpsize <= sizeof(u))
-                       memcpy(&u.ifreq, cp, cpsize);
+                       memmove(&u.ifreq, cp, cpsize);
 #elif defined SIOCGIFCONF_ADDR
                cpsize = sizeof(u.ifreq);
 #else
@@ -787,10 +787,10 @@ scan_interfaces(int *have_v4, int *have_v6) {
                switch (u.ifreq.ifr_addr.sa_family) {
                case AF_INET:
                        if (*have_v4 == 0) {
-                               memcpy(&in4,
-                                      &((struct sockaddr_in *)
-                                      &u.ifreq.ifr_addr)->sin_addr,
-                                      sizeof(in4));
+                               memmove(&in4,
+                                       &((struct sockaddr_in *)
+                                         &u.ifreq.ifr_addr)->sin_addr,
+                                       sizeof(in4));
                                if (in4.s_addr == INADDR_ANY)
                                        break;
                                n = ioctl(s, SIOCGIFFLAGS, (char *)&u.ifreq);
@@ -803,10 +803,10 @@ scan_interfaces(int *have_v4, int *have_v6) {
                        break;
                case AF_INET6:
                        if (*have_v6 == 0) {
-                               memcpy(&in6,
-                                      &((struct sockaddr_in6 *)
-                                      &u.ifreq.ifr_addr)->sin6_addr,
-                                      sizeof(in6));
+                               memmove(&in6,
+                                       &((struct sockaddr_in6 *)
+                                         &u.ifreq.ifr_addr)->sin6_addr,
+                                       sizeof(in6));
                                if (memcmp(&in6, &in6addr_any,
                                           sizeof(in6)) == 0)
                                        break;
@@ -908,13 +908,13 @@ copyandmerge(struct hostent *he1, struct hostent *he2, int af, int *error_num)
                         * Convert to mapped if required.
                         */
                        if (af == AF_INET6 && he1->h_addrtype == AF_INET) {
-                               memcpy(*npp, in6addr_mapped,
-                                      sizeof(in6addr_mapped));
-                               memcpy(*npp + sizeof(in6addr_mapped), *cpp,
-                                      INADDRSZ);
+                               memmove(*npp, in6addr_mapped,
+                                       sizeof(in6addr_mapped));
+                               memmove(*npp + sizeof(in6addr_mapped), *cpp,
+                                       INADDRSZ);
                        } else {
-                               memcpy(*npp, *cpp,
-                                      (af == AF_INET) ? INADDRSZ : IN6ADDRSZ);
+                               memmove(*npp, *cpp,
+                                       (af == AF_INET) ? INADDRSZ : IN6ADDRSZ);
                        }
                        cpp++;
                        npp++;
@@ -931,13 +931,13 @@ copyandmerge(struct hostent *he1, struct hostent *he2, int af, int *error_num)
                         * Convert to mapped if required.
                         */
                        if (af == AF_INET6 && he2->h_addrtype == AF_INET) {
-                               memcpy(*npp, in6addr_mapped,
-                                      sizeof(in6addr_mapped));
-                               memcpy(*npp + sizeof(in6addr_mapped), *cpp,
-                                      INADDRSZ);
+                               memmove(*npp, in6addr_mapped,
+                                       sizeof(in6addr_mapped));
+                               memmove(*npp + sizeof(in6addr_mapped), *cpp,
+                                       INADDRSZ);
                        } else {
-                               memcpy(*npp, *cpp,
-                                      (af == AF_INET) ? INADDRSZ : IN6ADDRSZ);
+                               memmove(*npp, *cpp,
+                                       (af == AF_INET) ? INADDRSZ : IN6ADDRSZ);
                        }
                        cpp++;
                        npp++;
@@ -1060,7 +1060,7 @@ hostfromaddr(lwres_gnbaresponse_t *addr, int af, const void *src) {
        he->h_addr_list[0] = malloc(he->h_length);
        if (he->h_addr_list[0] == NULL)
                goto cleanup;
-       memcpy(he->h_addr_list[0], src, he->h_length);
+       memmove(he->h_addr_list[0], src, he->h_length);
        he->h_addr_list[1] = NULL;
        return (he);
 
@@ -1140,7 +1140,7 @@ hostfromname(lwres_gabnresponse_t *name, int af) {
                he->h_addr_list[i] = malloc(he->h_length);
                if (he->h_addr_list[i] == NULL)
                        goto cleanup;
-               memcpy(he->h_addr_list[i], addr->address, he->h_length);
+               memmove(he->h_addr_list[i], addr->address, he->h_length);
                addr = LWRES_LIST_NEXT(addr, link);
                i++;
        }
index 16af741d2e43bea8f2b6bf8700c4cff05caca613..981de235dbe8e2cf8a7f0c441323e55a40a25882 100644 (file)
@@ -228,8 +228,8 @@ lwres_getrrsetbyname(const char *hostname, unsigned int rdclass,
                        result = ERRSET_NOMEMORY;
                        goto fail;
                }
-               memcpy(rrset->rri_rdatas[i].rdi_data, response->rdatas[i],
-                      rrset->rri_rdatas[i].rdi_length);
+               memmove(rrset->rri_rdatas[i].rdi_data, response->rdatas[i],
+                       rrset->rri_rdatas[i].rdi_length);
        }
        rrset->rri_nsigs = response->nsigs;
        rrset->rri_sigs = sane_calloc(rrset->rri_nsigs,
@@ -246,8 +246,8 @@ lwres_getrrsetbyname(const char *hostname, unsigned int rdclass,
                        result = ERRSET_NOMEMORY;
                        goto fail;
                }
-               memcpy(rrset->rri_sigs[i].rdi_data, response->sigs[i],
-                      rrset->rri_sigs[i].rdi_length);
+               memmove(rrset->rri_sigs[i].rdi_data, response->sigs[i],
+                       rrset->rri_sigs[i].rdi_length);
        }
 
        lwres_grbnresponse_free(lwrctx, &response);
index 49aaeb7bc912df62389e8d3d1b18351f95d9d753..92dbb02c06d65ebba49e2427f75a734f6cc845a2 100644 (file)
@@ -339,7 +339,7 @@ lwres_buffer_putmem(lwres_buffer_t *b, const unsigned char *base,
        REQUIRE(b->used + length <= b->length);
 
        cp = (unsigned char *)b->base + b->used;
-       memcpy(cp, base, length);
+       memmove(cp, base, length);
        b->used += length;
 }
 
@@ -357,5 +357,5 @@ lwres_buffer_getmem(lwres_buffer_t *b, unsigned char *base,
        cp += b->current;
        b->current += length;
 
-       memcpy(base, cp, length);
+       memmove(base, cp, length);
 }
index e9a867100f29037f95e142aee81efbaf4a45498c..23cc8859925c40d42ba1a7ffbefe9485731a3ca2 100644 (file)
@@ -455,16 +455,16 @@ lwres_create_addr(const char *buffer, lwres_addr_t *addr, int convert_zero) {
                        unsigned char zeroaddress[] = {0, 0, 0, 0};
                        unsigned char loopaddress[] = {127, 0, 0, 1};
                        if (memcmp(&v4, zeroaddress, 4) == 0)
-                               memcpy(&v4, loopaddress, 4);
+                               memmove(&v4, loopaddress, 4);
                }
                addr->family = LWRES_ADDRTYPE_V4;
                addr->length = NS_INADDRSZ;
-               memcpy((void *)addr->address, &v4, NS_INADDRSZ);
+               memmove((void *)addr->address, &v4, NS_INADDRSZ);
 
        } else if (lwres_net_pton(AF_INET6, buffer, &v6) == 1) {
                addr->family = LWRES_ADDRTYPE_V6;
                addr->length = NS_IN6ADDRSZ;
-               memcpy((void *)addr->address, &v6, NS_IN6ADDRSZ);
+               memmove((void *)addr->address, &v6, NS_IN6ADDRSZ);
        } else {
                return (LWRES_R_FAILURE); /* Unrecognised format. */
        }
index e0ea85df35736c5e65f488a54dd2706cbf63bec4..44c74638c40d101a887642594640648f0a2067b4 100644 (file)
@@ -115,7 +115,7 @@ inet_pton4(const char *src, unsigned char *dst) {
        }
        if (octets < 4)
                return (0);
-       memcpy(dst, tmp, NS_INADDRSZ);
+       memmove(dst, tmp, NS_INADDRSZ);
        return (1);
 }
 
@@ -209,6 +209,6 @@ inet_pton6(const char *src, unsigned char *dst) {
        }
        if (tp != endp)
                return (0);
-       memcpy(dst, tmp, NS_IN6ADDRSZ);
+       memmove(dst, tmp, NS_IN6ADDRSZ);
        return (1);
 }
index 3bf5660f3da5fc78eaeb59713a317a2ac4e7b6fa..d947def7a15d1d9bdfd9b9d86152f9d482e57b1d 100644 (file)
@@ -390,7 +390,7 @@ lwres_getnamebyaddr(lwres_context_t *ctx, lwres_uint32_t addrtype,
        request.flags = 0;
        request.addr.family = addrtype;
        request.addr.length = addrlen;
-       memcpy(request.addr.address, addr, addrlen);
+       memmove(request.addr.address, addr, addrlen);
        pkt.pktflags = 0;
        pkt.serial = serial;
        pkt.result = 0;