libeufin

commit 76c661cc022d0080778559d3194217eec77e766c
parent 9065207368c50b976f2b4a0a8e923b6f7ad5fa0c
Author: Florian Dold <florian@dold.me>
Date:   Mon,  9 Oct 2023 22:50:33 +0200

util: handle inlining directive from relative parent source file

Diffstat:
M
util/src/main/kotlin/TalerConfig.kt
 | 
7
+++++--

1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/util/src/main/kotlin/TalerConfig.kt b/util/src/main/kotlin/TalerConfig.kt
@@ -156,7 +156,11 @@ class TalerConfig(
         if (f[0] == '/') {
             return f
         }
-        val parentDir = Path(parentFilename).parent!!.toString()
+        val parentDirPath = Path(parentFilename).toRealPath().parent
+        if (parentDirPath == null) {
+            throw TalerConfigError("unable to normalize inline path, cannot resolve parent directory of $parentFilename")
+        }
+        val parentDir = parentDirPath.toString()
         return Paths.get(parentDir, f).toRealPath().toString()
     }
 
@@ -413,7 +417,6 @@ class TalerConfig(
         }
     }
 
-
     /**
      * Determine the filename of the default configuration file.
      *