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/isc/hex.c | |
| parent | 2f7409b5f669dbe3c0a8e58d8f526cb6ac4f64e1 (diff) | |
Vendor import of BIND 9.8.7vendor/bind9/9.8.7vendor/bind9-9.8
Approved by: delphij (mentor, implicit)
Sponsored by: DK Hostmaster A/S
Notes
Notes:
svn path=/vendor/bind9/dist-9.8/; revision=262443
svn path=/vendor/bind9/9.8.7/; revision=262444; tag=vendor/bind9/9.8.7
Diffstat (limited to 'lib/isc/hex.c')
| -rw-r--r-- | lib/isc/hex.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/isc/hex.c b/lib/isc/hex.c index 3fa0e699fa55..00903c7374cf 100644 --- a/lib/isc/hex.c +++ b/lib/isc/hex.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007, 2008 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2008, 2013, 2014 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -99,7 +99,7 @@ hex_decode_char(hex_decode_ctx_t *ctx, int c) { if ((s = strchr(hex, toupper(c))) == NULL) return (ISC_R_BADHEX); - ctx->val[ctx->digits++] = s - hex; + ctx->val[ctx->digits++] = (int)(s - hex); if (ctx->digits == 2) { unsigned char num; @@ -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); } |