diff options
| author | Chantry Xavier <shiningxc@gmail.com> | 2008-02-07 14:58:23 +0100 |
|---|---|---|
| committer | Chantry Xavier <shiningxc@gmail.com> | 2008-02-07 14:58:23 +0100 |
| commit | 0c2206f542ce6df2606586d43f190cd5a423fb13 (patch) | |
| tree | e771071518a2356c997c92fb41887e451b68797e | |
| parent | b29838c8250125a22016c16180e941d059d55539 (diff) | |
| download | pacman-0c2206f542ce6df2606586d43f190cd5a423fb13.tar.xz | |
libalpm/add.c : safety check for fixing FS#9235.
Fixes FS#9235.
We already had the following case in extract_single_file :
/* cases 1,2,3: couldn't stat an existing file, skip all backup checks */
But we actually only did a lstat here. And if lstat worked, we did a stat
without checking.
When lstat works and stat fails, it means we have a broken symlink, like in
FS#9235. We can actually treat this case like a non-existing file.
The broken symlink will then be simply overwritten.
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
| -rw-r--r-- | lib/libalpm/add.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index ec49c2a3..eddf637e 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -361,14 +361,12 @@ static int extract_single_file(struct archive *archive, * links, etc. * 12- skip extraction, dir already exists. */ - struct stat lsbuf; - if(_alpm_lstat(filename, &lsbuf) != 0) { + + /* do both a lstat and a stat, so we can see what symlinks point to */ + struct stat lsbuf, sbuf; + if(_alpm_lstat(filename, &lsbuf) != 0 || stat(filename, &sbuf) != 0) { /* cases 1,2,3: couldn't stat an existing file, skip all backup checks */ } else { - /* do a stat as well, so we can see what symlinks point to */ - struct stat sbuf; - stat(filename, &sbuf); - if(S_ISDIR(lsbuf.st_mode) && S_ISDIR(entrymode)) { /* case 12: existing dir, ignore it */ if(lsbuf.st_mode != entrymode) { |