moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

fix off-by-one error in _alpm_filelist_resolve 

'/' should not be appended to the resolved root when root is "/".

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2013-02-13 17:49:02 -05:00 committed by Allan McRae
parent d5a5a6b512
commit bc747fbfbf
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libalpm/filelist.c
View File

@ -198,12 +198,16 @@ int _alpm_filelist_resolve(alpm_handle_t *handle, alpm_filelist_t *files)
if(realpath(handle->root, path) == NULL){
return -1;
}
root_len = strlen(path) + 1;
if(root_len >= PATH_MAX) {
root_len = strlen(path);
if(root_len + 1 >= PATH_MAX) {
return -1;
}
path[root_len - 1] = '/';
path[root_len] = '\0';
/* append '/' if root is not "/" */
if(path[root_len - 1] != '/') {
path[root_len] = '/';
root_len++;
path[root_len] = '\0';
}
ret = _alpm_filelist_resolve_link(files, &i, path, root_len, 0);