diff options
| author | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2019-03-22 08:13:29 +0000 |
|---|---|---|
| committer | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2019-03-22 08:13:29 +0000 |
| commit | 86b73a00bf9c0f23546595caa0ddc46bebca885a (patch) | |
| tree | 3e249d6d4f79d82389f750df5422b6b0a08f1bfc | |
| parent | cc0c2279907bf74bf22c56cb2a1bb6ba6d1b99c3 (diff) | |
| download | libapr-86b73a00bf9c0f23546595caa0ddc46bebca885a.tar.gz | |
* file_io/unix/filepath.c (apr_filepath_merge): Fix Coverity warning;
don't copy bogus pointer after apr_filepath_get() error return.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1856030 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | file_io/unix/filepath.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/file_io/unix/filepath.c b/file_io/unix/filepath.c index b3dd2cac9..4c1ca7745 100644 --- a/file_io/unix/filepath.c +++ b/file_io/unix/filepath.c @@ -135,10 +135,10 @@ APR_DECLARE(apr_status_t) apr_filepath_merge(char **newpath, */ char *getpath; rv = apr_filepath_get(&getpath, flags, p); - rootpath = getpath; if (rv != APR_SUCCESS) return errno; + rootpath = getpath; /* XXX: Any kernel subject to goofy, uncanonical results * must run the rootpath against the user's given flags. * Simplest would be a recursive call to apr_filepath_merge |