You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2019/03/22 08:13:29 UTC

svn commit: r1856030 - /apr/apr/trunk/file_io/unix/filepath.c

Author: jorton
Date: Fri Mar 22 08:13:29 2019
New Revision: 1856030

URL: http://svn.apache.org/viewvc?rev=1856030&view=rev
Log:
* file_io/unix/filepath.c (apr_filepath_merge): Fix Coverity warning;
  don't copy bogus pointer after apr_filepath_get() error return.

Modified:
    apr/apr/trunk/file_io/unix/filepath.c

Modified: apr/apr/trunk/file_io/unix/filepath.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/file_io/unix/filepath.c?rev=1856030&r1=1856029&r2=1856030&view=diff
==============================================================================
--- apr/apr/trunk/file_io/unix/filepath.c (original)
+++ apr/apr/trunk/file_io/unix/filepath.c Fri Mar 22 08:13:29 2019
@@ -135,10 +135,10 @@ APR_DECLARE(apr_status_t) apr_filepath_m
          */
         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