bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'allan/pathmax' into 'master'

Browse source 
Adjust PATH_MAX length tests using snprintf

See merge request pacman/pacman!288
This commit is contained in:
Allan McRae 2025-08-02 14:52:37 +10:00
commit 1d5c52e30b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/pacman/sync.c
View file

@ -84,7 +84,7 @@ static int sync_cleandb(const char *dbpath)
/* build the full path */ /* build the full path */
len = snprintf(path, PATH_MAX, "%s%s", dbpath, dname); len = snprintf(path, PATH_MAX, "%s%s", dbpath, dname);
if(len > PATH_MAX) { if(len >= PATH_MAX) {
pm_printf(ALPM_LOG_ERROR, _("could not remove %s%s: path exceeds PATH_MAX\n"), pm_printf(ALPM_LOG_ERROR, _("could not remove %s%s: path exceeds PATH_MAX\n"),
dbpath, dname); dbpath, dname);
} }
@ -245,7 +245,7 @@ static int sync_cleancache(int level)
/* build the full filepath */ /* build the full filepath */
len=snprintf(path, PATH_MAX, "%s%s", cachedir, ent->d_name); len=snprintf(path, PATH_MAX, "%s%s", cachedir, ent->d_name);
if(len > PATH_MAX) { if(len >= PATH_MAX) {
pm_printf(ALPM_LOG_ERROR, _("skipping %s%s: path exceeds PATH_MAX\n"), pm_printf(ALPM_LOG_ERROR, _("skipping %s%s: path exceeds PATH_MAX\n"),
cachedir, ent->d_name); cachedir, ent->d_name);
continue; continue;