Commit 0eaf8903 authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* Although the lstat call should rarely ever fail, because we stat'ed the 

  same file several lines above, check the return value to be save that
  nothing bad happens in the case it does fail.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425394 13f79535-47bb-0310-9956-ffa450edef68
parent 676786bb

server/request.c

+16 −3
Original line number Diff line number Diff line
@@ -553,9 +553,22 @@ AP_DECLARE(int) ap_directory_walk(request_rec *r) 
             * check.

             */

            if (!(opts & OPT_SYM_LINKS)) {

                apr_stat(&thisinfo, r->filename,

                rv = apr_stat(&thisinfo, r->filename,

                              APR_FINFO_MIN | APR_FINFO_NAME | APR_FINFO_LINK,

                              r->pool);

                if (rv != APR_SUCCESS) {

                    /*

                     * This should never happen, because we did a stat on the

                     * same file, resolving a possible symlink several lines

                     * above. Therefore do not make a detailed analysis of rv

                     * in this case for the reason of the failure, just bail out

                     * with a HTTP_FORBIDDEN in case we hit a race condition

                     * here.

                     */

                    ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,

                                  "access to %s failed", r->uri);

                    return r->status = HTTP_FORBIDDEN;

                }

                if (thisinfo.filetype == APR_LNK) {

                    /* Is this a possibly acceptable symlink? */

                    if ((res = resolve_symlink(r->filename, &thisinfo,