Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-6]: src/dist/bind/lib Pull up revision 1.3 (requested by itojun...



details:   https://anonhg.NetBSD.org/src/rev/36ca4caa659b
branches:  netbsd-1-6
changeset: 528193:36ca4caa659b
user:      lukem <lukem%NetBSD.org@localhost>
date:      Fri Jun 28 11:45:47 2002 +0000

description:
Pull up revision 1.3 (requested by itojun in ticket #387):
Update to BIND 8.3.3.  Fixes buffer overrun in resolver code.

diffstat:

 dist/bind/lib/inet/nsap_addr.c |  9 +++++----
 dist/bind/lib/irs/dns.c        |  6 ++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diffs (64 lines):

diff -r 36b494cad58d -r 36ca4caa659b dist/bind/lib/inet/nsap_addr.c
--- a/dist/bind/lib/inet/nsap_addr.c    Fri Jun 28 11:45:38 2002 +0000
+++ b/dist/bind/lib/inet/nsap_addr.c    Fri Jun 28 11:45:47 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nsap_addr.c,v 1.2 2001/05/17 23:00:18 itojun Exp $     */
+/*     $NetBSD: nsap_addr.c,v 1.2.2.1 2002/06/28 11:45:47 lukem Exp $  */
 
 /*
  * Copyright (c) 1996-1999 by Internet Software Consortium.
@@ -18,7 +18,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "Id: nsap_addr.c,v 8.11 2001/03/26 07:04:30 marka Exp";
+static const char rcsid[] = "Id: nsap_addr.c,v 8.12 2001/05/28 07:37:46 marka Exp";
 #endif /* LIBC_SCCS and not lint */
 
 #include "port_before.h"
@@ -48,6 +48,7 @@
 
        if (ascii[0] != '0' || (ascii[1] != 'x' && ascii[1] != 'X'))
                return (0);
+       ascii += 2;
 
        while ((c = *ascii++) != '\0' && len < (u_int)maxlen) {
                if (c == '.' || c == '+' || c == '/')
@@ -90,8 +91,8 @@
                start = tmpbuf;
        }
 
-       *ascii = '0';
-       *ascii = 'x';
+       *ascii++ = '0';
+       *ascii++ = 'x';
 
        if (binlen > 255)
                binlen = 255;
diff -r 36b494cad58d -r 36ca4caa659b dist/bind/lib/irs/dns.c
--- a/dist/bind/lib/irs/dns.c   Fri Jun 28 11:45:38 2002 +0000
+++ b/dist/bind/lib/irs/dns.c   Fri Jun 28 11:45:47 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dns.c,v 1.2 2001/01/27 07:22:03 itojun Exp $   */
+/*     $NetBSD: dns.c,v 1.2.2.1 2002/06/28 11:45:57 lukem Exp $        */
 
 /*
  * Copyright (c) 1996-1999 by Internet Software Consortium.
@@ -18,7 +18,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "Id: dns.c,v 1.15 2000/02/28 07:52:16 vixie Exp";
+static const char rcsid[] = "Id: dns.c,v 1.16 2001/05/29 05:48:26 marka Exp";
 #endif
 
 /*
@@ -61,6 +61,8 @@
        struct irs_acc *acc;
        struct dns_p *dns;
 
+       UNUSED(options);
+
        if (!(acc = memget(sizeof *acc))) {
                errno = ENOMEM;
                return (NULL);



Home | Main Index | Thread Index | Old Index