summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2015-10-14 08:27:51 +1100
committerDamien Miller <djm@mindrot.org>2015-10-14 08:27:51 +1100
commit23fa695bb735f54f04d46123662609edb6c76767 (patch)
tree12291ad90350a1797da254d3b3bfb853f8a9756d
parentc71be375a69af00c2d0a0c24d8752bec12d8fd1b (diff)
upstream commit
revision 1.19 date: 2015/01/16 16:48:51; author: deraadt; state: Exp; lines: +3 -3; commitid: 0DYulI8hhujBHMcR; Move to the <limits.h> universe. review by millert, binary checking process with doug, concept with guenther
-rw-r--r--openbsd-compat/realpath.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/openbsd-compat/realpath.c b/openbsd-compat/realpath.c
index e4729a808..a6ac09ba5 100644
--- a/openbsd-compat/realpath.c
+++ b/openbsd-compat/realpath.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: realpath.c,v 1.18 2014/10/19 03:56:28 doug Exp $ */ 1/* $OpenBSD: realpath.c,v 1.19 2015/01/16 16:48:51 deraadt Exp $ */
2/* 2/*
3 * Copyright (c) 2003 Constantin S. Svintsoff <kostik@iclub.nsu.ru> 3 * Copyright (c) 2003 Constantin S. Svintsoff <kostik@iclub.nsu.ru>
4 * 4 *
@@ -42,6 +42,7 @@
42#include <stddef.h> 42#include <stddef.h>
43#include <string.h> 43#include <string.h>
44#include <unistd.h> 44#include <unistd.h>
45#include <limits.h>
45 46
46/* A slightly modified copy of this file exists in libexec/ld.so */ 47/* A slightly modified copy of this file exists in libexec/ld.so */
47 48
@@ -164,7 +165,7 @@ realpath(const char *path, char *resolved)
164 goto err; 165 goto err;
165 } 166 }
166 if (S_ISLNK(sb.st_mode)) { 167 if (S_ISLNK(sb.st_mode)) {
167 if (symlinks++ > MAXSYMLINKS) { 168 if (symlinks++ > SYMLOOP_MAX) {
168 errno = ELOOP; 169 errno = ELOOP;
169 goto err; 170 goto err;
170 } 171 }