]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Improve termination condition of while loop to compare
authordtucker@openbsd.org <dtucker@openbsd.org>
Wed, 11 Jun 2025 13:24:05 +0000 (13:24 +0000)
committerDarren Tucker <dtucker@dtucker.net>
Wed, 11 Jun 2025 13:31:12 +0000 (23:31 +1000)
size_t's.  Assuming read() does what it's supposed to this shouldn't matter,
but should be more robust.  Flagged by Coverity CID 470514, ok djm@

OpenBSD-Commit-ID: d7b5ad60feb797b3464964b9ea67fd78fb9d6cc6

readpass.c

index d42b1185d017d55096849455267792b3eb6c5761..5a88824b4f6c1933459f94c632c23077bff1cb30 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: readpass.c,v 1.71 2024/03/30 04:27:44 djm Exp $ */
+/* $OpenBSD: readpass.c,v 1.72 2025/06/11 13:24:05 dtucker Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -91,7 +91,7 @@ ssh_askpass(char *askpass, const char *msg, const char *env_hint)
                if (r <= 0)
                        break;
                len += r;
-       } while (sizeof(buf) - 1 - len > 0);
+       } while (len < sizeof(buf) - 1);
        buf[len] = '\0';
 
        close(p[0]);