diff options
author | Damien Miller <djm@mindrot.org> | 2011-09-22 21:20:21 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-09-22 21:20:21 +1000 |
commit | e01a6270477bc4037ec8b48c5c19caf6be0818c6 (patch) | |
tree | 1ff80e7227b1929c120b1d5a5e320260a78b66cf /openbsd-compat | |
parent | e8a82c5fafdbe4ffd4295c25a4cce5ff131a1524 (diff) |
- pyr@cvs.openbsd.org 2011/05/12 07:15:10
[openbsd-compat/glob.c]
When the max number of items for a directory has reached GLOB_LIMIT_READDIR
an error is returned but closedir() is not called.
spotted and fix provided by Frank Denis obsd-tech@pureftpd.org
ok otto@, millert@
Diffstat (limited to 'openbsd-compat')
-rw-r--r-- | openbsd-compat/glob.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index 0341225cd..ebb7aa805 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: glob.c,v 1.35 2011/01/12 01:53:14 djm Exp $ */ | 1 | /* $OpenBSD: glob.c,v 1.36 2011/05/12 07:15:10 pyr Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1989, 1993 | 3 | * Copyright (c) 1989, 1993 |
4 | * The Regents of the University of California. All rights reserved. | 4 | * The Regents of the University of California. All rights reserved. |
@@ -697,7 +697,8 @@ glob3(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last, | |||
697 | errno = 0; | 697 | errno = 0; |
698 | *pathend++ = SEP; | 698 | *pathend++ = SEP; |
699 | *pathend = EOS; | 699 | *pathend = EOS; |
700 | return(GLOB_NOSPACE); | 700 | err = GLOB_NOSPACE; |
701 | break; | ||
701 | } | 702 | } |
702 | 703 | ||
703 | /* Initial DOT must be matched literally. */ | 704 | /* Initial DOT must be matched literally. */ |