walkero
/
pcre2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Avoid use of PATH_MAX (Debian bug #1009066) 

PATH_MAX is undefined on GNU Hurd (as is allowed by POSIX), and is in
some regards problematic anyway (cf
https://www.gnu.org/software/hurd/hurd/porting/guidelines.html#PATH_MAX_tt_MAX_PATH_tt_MAXPATHL
).

This patch from Yavor Doganov instead dynamically allocates
`*resolvedpath` as necessary using `realpath(childpath, NULL)` (and
then makes sure to free it later).

Signed-off-by: Matthew Vernon <matthew@debian.org>
This commit is contained in:
Yavor Doganov 2022-04-09 17:19:14 +01:00 committed by Matthew Vernon
parent 64c9baaaa4
commit d6a92729b5
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pcre2grep.c
View File

@ -3295,19 +3295,25 @@ if (isdirectory(pathname))
#ifdef HAVE_REALPATH
{
char resolvedpath[PATH_MAX];
char *resolvedpath;
BOOL isSame;
size_t rlen;
if (realpath(childpath, resolvedpath) == NULL)
if ((resolvedpath = realpath(childpath, NULL)) == NULL)
continue; /* This path is invalid - we can skip processing this */
isSame = strcmp(pathname, resolvedpath) == 0;
if (isSame) continue; /* We have a recursion */
if (isSame)
{
free(resolvedpath);
continue; /* We have a recursion */
}
rlen = strlen(resolvedpath);
if (rlen++ < sizeof(resolvedpath) - 3)
rlen++;
{
BOOL contained;
resolvedpath = (char *)realloc(resolvedpath, rlen + 1);
strcat(resolvedpath, "/");
contained = strncmp(pathname, resolvedpath, rlen) == 0;
free(resolvedpath);
if (contained) continue; /* We have a recursion */
}
}