diff options
| author | Erwin Lansing <erwin@FreeBSD.org> | 2014-02-24 13:57:07 +0000 |
|---|---|---|
| committer | Erwin Lansing <erwin@FreeBSD.org> | 2014-02-24 13:57:07 +0000 |
| commit | e83d3091807de4060c0f7654609c0ba97c607698 (patch) | |
| tree | 34b1e1c094bea6410885fbd65ce50ada5dc33cdf /lib/dns/acl.c | |
| parent | 2f7409b5f669dbe3c0a8e58d8f526cb6ac4f64e1 (diff) | |
Notes
Diffstat (limited to 'lib/dns/acl.c')
| -rw-r--r-- | lib/dns/acl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/dns/acl.c b/lib/dns/acl.c index ec29bc7b54ca..860c180c779c 100644 --- a/lib/dns/acl.c +++ b/lib/dns/acl.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009, 2011, 2012 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009, 2011, 2012, 2014 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -288,8 +288,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, |