=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/channels.c,v retrieving revision 1.340 retrieving revision 1.341 diff -u -r1.340 -r1.341 --- src/usr.bin/ssh/channels.c 2015/01/20 23:14:00 1.340 +++ src/usr.bin/ssh/channels.c 2015/02/06 23:21:59 1.341 @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.340 2015/01/20 23:14:00 deraadt Exp $ */ +/* $OpenBSD: channels.c,v 1.341 2015/02/06 23:21:59 millert Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -54,12 +54,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include "xmalloc.h" @@ -2159,7 +2159,7 @@ nfdset = howmany(n+1, NFDBITS); /* Explicitly test here, because xrealloc isn't always called */ - if (nfdset && SIZE_T_MAX / nfdset < sizeof(fd_mask)) + if (nfdset && SIZE_MAX / nfdset < sizeof(fd_mask)) fatal("channel_prepare_select: max_fd (%d) is too large", n); sz = nfdset * sizeof(fd_mask);