aboutsummaryrefslogtreecommitdiff
path: root/lib/isc
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2010-12-04 00:42:21 +0000
committerDoug Barton <dougb@FreeBSD.org>2010-12-04 00:42:21 +0000
commitf805c4c11684ad447d955512cb705ebc2aba9ef3 (patch)
treea2b1f0f7c5b10430273550cac18402eceb063664 /lib/isc
parent0f0e363281d939478823f6d05bcab56d901ead06 (diff)
Vendor import of BIND 9.6-ESV-R3vendor/bind9/9.6-ESV-R3
Diffstat (limited to 'lib/isc')
-rw-r--r--lib/isc/api2
-rw-r--r--lib/isc/print.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/isc/api b/lib/isc/api
index 823f692fe3c4..b765f45fee6b 100644
--- a/lib/isc/api
+++ b/lib/isc/api
@@ -1,3 +1,3 @@
LIBINTERFACE = 53
-LIBREVISION = 0
+LIBREVISION = 1
LIBAGE = 3
diff --git a/lib/isc/print.c b/lib/isc/print.c
index b892e3a2ed09..6b9819505584 100644
--- a/lib/isc/print.c
+++ b/lib/isc/print.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2008 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2008, 2010 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2001, 2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: print.c,v 1.35 2008/02/18 23:46:59 tbox Exp $ */
+/* $Id: print.c,v 1.35.418.2 2010/10/18 23:46:34 tbox Exp $ */
/*! \file */
@@ -468,7 +468,7 @@ isc_print_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
if (width > 0) {
count += width;
width--;
- if (left) {
+ if (left && size > 1) {
*str++ = c;
size--;
}