Pointers into packet data should usually be pointers to unsigned 1-byte

[tcpdump] / missing / getnameinfo.c

diff --git a/missing/getnameinfo.c b/missing/getnameinfo.c
index d525f4554ab691739d0cc037b2eb936be2942a97..c287221c402b705d92b1fd3ffc9e35c9cdd68ed5 100644 (file)
--- a/missing/getnameinfo.c
+++ b/missing/getnameinfo.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 3. Neither the name of the project nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -39,11 +39,11 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif 
+#endif
 
 #ifndef lint
-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/missing/getnameinfo.c,v 1.6 2000-01-21 04:06:19 itojun Exp $";
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/missing/getnameinfo.c,v 1.11 2003-11-16 09:36:49 guy Exp $";
 #endif
 
 #include <sys/types.h>
@@ -58,10 +58,6 @@ static const char rcsid[] =
 #include <stddef.h>
 #include <errno.h>
 
-#ifndef HAVE_PORTABLE_PROTOTYPE
-#include "cdecl_ext.h"
-#endif 
-
 #ifdef NEED_ADDRINFO_H
 #include "addrinfo.h"
 #endif
@@ -128,7 +124,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
        if (sa->sa_len != salen)
                return ENI_SALEN;
 #endif
-       
+
        family = sa->sa_family;
        for (i = 0; afdl[i].a_af; i++)
                if (afdl[i].a_af == family) {
@@ -136,11 +132,11 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
                        goto found;
                }
        return ENI_FAMILY;
-       
+
  found:
        if (salen != afd->a_socklen)
                return ENI_SALEN;
-       
+
        port = ((struct sockinet *)sa)->si_port; /* network byte order */
        addr = (char *)sa + afd->a_off;
 
@@ -159,12 +155,12 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
                                (flags & NI_DGRAM) ? "udp" : "tcp");
                }
                if (sp) {
-                       if (strlen(sp->s_name) > servlen)
+                       if (strlen(sp->s_name) + 1 > servlen)
                                return ENI_MEMORY;
                        strcpy(serv, sp->s_name);
                } else {
                        snprintf(numserv, sizeof(numserv), "%d", ntohs(port));
-                       if (strlen(numserv) > servlen)
+                       if (strlen(numserv) + 1 > servlen)
                                return ENI_MEMORY;
                        strcpy(serv, numserv);
                }
@@ -178,7 +174,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
                        flags |= NI_NUMERICHOST;
                v4a >>= IN_CLASSA_NSHIFT;
                if (v4a == 0)
-                       flags |= NI_NUMERICHOST;                        
+                       flags |= NI_NUMERICHOST;
                break;
 #ifdef INET6
        case AF_INET6:
@@ -220,7 +216,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
                if (inet_ntop(afd->a_af, addr, numaddr, sizeof(numaddr))
                    == NULL)
                        return ENI_SYSTEM;
-               if (strlen(numaddr) > hostlen)
+               if (strlen(numaddr) + 1 > hostlen)
                        return ENI_MEMORY;
                strcpy(host, numaddr);
 #if defined(INET6) && defined(NI_WITHSCOPEID)
@@ -260,7 +256,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
                                p = strchr(hp->h_name, '.');
                                if (p) *p = '\0';
                        }
-                       if (strlen(hp->h_name) > hostlen) {
+                       if (strlen(hp->h_name) + 1 > hostlen) {
 #ifdef USE_GETIPNODEBY
                                freehostent(hp);
 #endif
@@ -276,7 +272,7 @@ getnameinfo(sa, salen, host, hostlen, serv, servlen, flags)
                        if (inet_ntop(afd->a_af, addr, numaddr, sizeof(numaddr))
                            == NULL)
                                return ENI_NOHOSTNAME;
-                       if (strlen(numaddr) > hostlen)
+                       if (strlen(numaddr) + 1 > hostlen)
                                return ENI_MEMORY;
                        strcpy(host, numaddr);
                }