[pulseaudio-discuss] [PATCH 2/3] Fix logic of pa_make_path_absolute()

[Andy Shevchenko]

From: Andy Shevchenko <ext-andriy.shevchenko at nokia.com>

Make it works as described in commentary (when fn is NULL, pa_assert(fn) could
break logic).

Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko at nokia.com>
---
 src/pulsecore/core-util.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index 1c8c678..6782301 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -1877,17 +1877,17 @@ char *pa_make_path_absolute(const char *p) {
 static char *get_path(const char *fn, pa_bool_t prependmid, pa_bool_t rt) {
     char *rtp;
 
-    if (pa_is_path_absolute(fn))
-        return pa_xstrdup(fn);
-
     rtp = rt ? pa_get_runtime_dir() : pa_get_state_dir();
 
-    if (!rtp)
-        return NULL;
-
     if (fn) {
         char *r;
 
+        if (pa_is_path_absolute(fn))
+            return pa_xstrdup(fn);
+
+        if (!rtp)
+            return NULL;
+
         if (prependmid) {
             char *mid;
 
-- 
1.5.6.5