From: Andrey Volk <andywolk@gmail.com>
Date: Wed, 19 Feb 2020 20:16:37 +0000 (+0400)
Subject: [apr] scan-build: Fix "Argument with 'nonnull' attribute passed null" in file_io... 
X-Git-Tag: v1.10.3^2~142^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F390%2Fhead;p=thirdparty%2Ffreeswitch.git

[apr] scan-build: Fix "Argument with 'nonnull' attribute passed null" in file_io/unix/filepath.c
---

diff --git a/libs/apr/file_io/unix/filepath.c b/libs/apr/file_io/unix/filepath.c
index cbf757e9ab..64f1b2fbd4 100644
--- a/libs/apr/file_io/unix/filepath.c
+++ b/libs/apr/file_io/unix/filepath.c
@@ -139,6 +139,9 @@ APR_DECLARE(apr_status_t) apr_filepath_merge(char **newpath,
         if (rv != APR_SUCCESS)
             return errno;
 
+        if (!getpath)
+            return APR_ENOMEM;
+
         /* 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