diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-10-07 09:42:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-10-07 09:42:37 -0400 |
| commit | 2ceea131406b3f88e4a6a9c6bfc9f47f4940ca47 (patch) | |
| tree | e2e2a5f460376470807c13921d05e8421f84177a /src | |
| parent | d41025312aa46675e44d93358a84d6777c404e8d (diff) | |
| parent | 304ae473cac9e15d5a893d3d95e0479649758bbd (diff) | |
| download | tor-2ceea131406b3f88e4a6a9c6bfc9f47f4940ca47.tar.gz tor-2ceea131406b3f88e4a6a9c6bfc9f47f4940ca47.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/164'
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/fs/path.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c index 1a15969419..2eef4bded7 100644 --- a/src/lib/fs/path.c +++ b/src/lib/fs/path.c @@ -598,6 +598,12 @@ tor_glob(const char *pattern) return NULL; } + // #40141: workaround for bug in glibc < 2.19 where patterns ending in path + // separator match files and folders instead of folders only + size_t pattern_len = strlen(pattern); + bool dir_only = has_glob(pattern) && + pattern_len > 0 && pattern[pattern_len-1] == *PATH_SEPARATOR; + result = smartlist_new(); size_t i; for (i = 0; i < matches.gl_pathc; i++) { @@ -606,7 +612,12 @@ tor_glob(const char *pattern) if (len > 0 && match[len-1] == *PATH_SEPARATOR) { match[len-1] = '\0'; } - smartlist_add(result, match); + + if (!dir_only || (dir_only && is_dir(file_status(match)))) { + smartlist_add(result, match); + } else { + tor_free(match); + } } globfree(&matches); #else |