From 8f22911027ff6c17d7226d232ccd20727f389310 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 14 Oct 2015 08:28:19 +1100 Subject: upstream commit revision 1.20 date: 2015/10/13 20:55:37; author: millert; state: Exp; lines: +2 -2; commitid: X39sl5ay1czgFIgp; In rev 1.15 the sizeof argument was fixed in a strlcat() call but the truncation check immediately following it was not updated to match. Not an issue in practice since the buffers are the same size. OK deraadt@ --- openbsd-compat/realpath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openbsd-compat/realpath.c b/openbsd-compat/realpath.c index a6ac09ba5..a0199ab34 100644 --- a/openbsd-compat/realpath.c +++ b/openbsd-compat/realpath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: realpath.c,v 1.19 2015/01/16 16:48:51 deraadt Exp $ */ +/* $OpenBSD: realpath.c,v 1.20 2015/10/13 20:55:37 millert Exp $ */ /* * Copyright (c) 2003 Constantin S. Svintsoff * @@ -200,7 +200,7 @@ realpath(const char *path, char *resolved) symlink[slen + 1] = 0; } left_len = strlcat(symlink, left, sizeof(symlink)); - if (left_len >= sizeof(left)) { + if (left_len >= sizeof(symlink)) { errno = ENAMETOOLONG; goto err; } -- cgit v1.2.3