diff options
| author | Dan McGee <dan@archlinux.org> | 2011-02-04 15:42:52 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-02-04 15:42:55 +0100 |
| commit | 7467fb9e763d9895044791eb0407e58d2793f377 (patch) | |
| tree | bf82f0af2e946e5200ce1860fdb29d4594e7efa2 /lib | |
| parent | f89277536612ff8e204cefcb6ff7cca7079d6bd5 (diff) | |
| download | pacman-7467fb9e763d9895044791eb0407e58d2793f377.tar.gz pacman-7467fb9e763d9895044791eb0407e58d2793f377.tar.xz | |
Ensure found files are actually files
We located files in a few places but didn't check if they were files or
directories. Ensure they are actually files using stat() and S_ISREG(); this
showed itself when trying to download to the directory name itself in
FS#22645.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libalpm/dload.c | 4 | ||||
| -rw-r--r-- | lib/libalpm/util.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index cb6d000c..c856e96c 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -128,13 +128,13 @@ static int download_internal(const char *url, const char *localpath, destfile = get_destfile(localpath, filename); tempfile = get_tempfile(localpath, filename); - if(stat(tempfile, &st) == 0 && st.st_size > 0) { + if(stat(tempfile, &st) == 0 && S_ISREG(st.st_mode) && st.st_size > 0) { _alpm_log(PM_LOG_DEBUG, "tempfile found, attempting continuation\n"); local_time = fileurl->last_modified = st.st_mtime; local_size = fileurl->offset = (off_t)st.st_size; dl_thisfile = st.st_size; localf = fopen(tempfile, "ab"); - } else if(!force && stat(destfile, &st) == 0 && st.st_size > 0) { + } else if(!force && stat(destfile, &st) == 0 && S_ISREG(st.st_mode) && st.st_size > 0) { _alpm_log(PM_LOG_DEBUG, "destfile found, using mtime only\n"); local_time = fileurl->last_modified = st.st_mtime; local_size = /* no fu->off here */ (off_t)st.st_size; diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 82387b2f..a80a7327 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -608,12 +608,13 @@ char *_alpm_filecache_find(const char* filename) char path[PATH_MAX]; char *retpath; alpm_list_t *i; + struct stat buf; /* Loop through the cache dirs until we find a matching file */ for(i = alpm_option_get_cachedirs(); i; i = alpm_list_next(i)) { snprintf(path, PATH_MAX, "%s%s", (char*)alpm_list_getdata(i), filename); - if(access(path, R_OK) == 0) { + if(stat(path, &buf) == 0 && S_ISREG(buf.st_mode)) { retpath = strdup(path); _alpm_log(PM_LOG_DEBUG, "found cached pkg: %s\n", retpath); return(retpath); |