From e1a565880c0c92acbfd5246b2a5cd85e75180f61 Mon Sep 17 00:00:00 2001
From: millert <>
Date: Fri, 12 Jan 2001 22:55:23 +0000
Subject: Reverse the order of two loop invariant to make 'strlcat(0, "foo",
 0)' not get a SEGV; Richard Kettlewell <rjk@greenend.org.uk>

---
 src/lib/libc/string/strlcat.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/lib/libc/string/strlcat.c b/src/lib/libc/string/strlcat.c
index f7d43bb24b..5a23ef285c 100644
--- a/src/lib/libc/string/strlcat.c
+++ b/src/lib/libc/string/strlcat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strlcat.c,v 1.3 2000/11/24 11:10:02 itojun Exp $	*/
+/*	$OpenBSD: strlcat.c,v 1.4 2001/01/12 22:55:23 millert Exp $	*/
 
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -28,7 +28,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlcat.c,v 1.3 2000/11/24 11:10:02 itojun Exp $";
+static char *rcsid = "$OpenBSD: strlcat.c,v 1.4 2001/01/12 22:55:23 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -52,7 +52,7 @@ size_t strlcat(dst, src, siz)
 	size_t dlen;
 
 	/* Find the end of dst and adjust bytes left but don't go past end */
-	while (*d != '\0' && n-- != 0)
+	while (n-- != 0 && *d != '\0')
 		d++;
 	dlen = d - dst;
 	n = siz - dlen;
-- 
cgit v1.2.3-55-g6feb