From 05377622afcccaf18c2c69756039a38fe7a999a9 Mon Sep 17 00:00:00 2001
From: Andrey Volk <andywolk@gmail.com>
Date: Thu, 20 Feb 2020 00:16:37 +0400
Subject: [PATCH] [apr] scan-build: Fix "Argument with 'nonnull' attribute
 passed null" in file_io/unix/filepath.c

---
 libs/apr/file_io/unix/filepath.c | 3 +++
 1 file changed, 3 insertions(+)

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