===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/atomicio.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- src/usr.bin/ssh/atomicio.c	2006/04/16 00:52:55	1.18
+++ src/usr.bin/ssh/atomicio.c	2006/04/16 07:59:00	1.19
@@ -1,4 +1,4 @@
-/* $OpenBSD: atomicio.c,v 1.18 2006/04/16 00:52:55 djm Exp $ */
+/* $OpenBSD: atomicio.c,v 1.19 2006/04/16 07:59:00 djm Exp $ */
 /*
  * Copyright (c) 2006 Damien Miller. All rights reserved.
  * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
@@ -95,7 +95,7 @@
 				iovcnt--;
 			}
 			/* This shouldn't happen... */
-			if (rem > iov[0].iov_len || (rem > 0 && iovcnt <= 0)) {
+			if (rem > 0 && (iovcnt <= 0 || rem > iov[0].iov_len)) {
 				errno = EFAULT;
 				return 0;
 			}