Source-Changes-HG archive

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

[src/trunk]: src/external/bsd/ntp/dist Fix signed vs unsigned errors.



details:   https://anonhg.NetBSD.org/src/rev/c2cbb52c9a9d
branches:  trunk
changeset: 805140:c2cbb52c9a9d
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sat Dec 20 08:38:47 2014 +0000

description:
Fix signed vs unsigned errors.

diffstat:

 external/bsd/ntp/dist/ntpd/ntp_control.c |  4 ++--
 external/bsd/ntp/dist/sntp/networking.c  |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 8073a0f68778 -r c2cbb52c9a9d external/bsd/ntp/dist/ntpd/ntp_control.c
--- a/external/bsd/ntp/dist/ntpd/ntp_control.c  Sat Dec 20 07:02:25 2014 +0000
+++ b/external/bsd/ntp/dist/ntpd/ntp_control.c  Sat Dec 20 08:38:47 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntp_control.c,v 1.9 2014/12/19 20:43:17 christos Exp $ */
+/*     $NetBSD: ntp_control.c,v 1.10 2014/12/20 08:38:47 uebayasi Exp $        */
 
 /*
  * ntp_control.c - respond to mode 6 control messages and send async
@@ -1347,7 +1347,7 @@
                /*
                 * Not enough room in this one, flush it out.
                 */
-               currentlen = MIN(dlen, dataend - datapt);
+               currentlen = MIN(dlen, (unsigned int)(dataend - datapt));
 
                memcpy(datapt, dp, currentlen);
 
diff -r 8073a0f68778 -r c2cbb52c9a9d external/bsd/ntp/dist/sntp/networking.c
--- a/external/bsd/ntp/dist/sntp/networking.c   Sat Dec 20 07:02:25 2014 +0000
+++ b/external/bsd/ntp/dist/sntp/networking.c   Sat Dec 20 08:38:47 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: networking.c,v 1.8 2014/12/19 20:43:18 christos Exp $  */
+/*     $NetBSD: networking.c,v 1.9 2014/12/20 08:38:47 uebayasi Exp $  */
 
 #include <config.h>
 #include "networking.h"
@@ -82,7 +82,7 @@
        while ((tail - head) > 6) {
                nlen = ntohl(*head++) & 0xffff;
                nlen = (nlen + 3) >> 2;
-               if (nlen > (tail - head) || nlen < 4)
+               if (nlen > (u_int)(tail - head) || nlen < 4)
                        return NULL;    /* Blooper! Inconsistent! */
                head += nlen;
        }



Home | Main Index | Thread Index | Old Index