[libeufin] branch master updated: util: handle inlining directive from relative parent source file

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository libeufin.

The following commit(s) were added to refs/heads/master by this push:
     new 76c661cc util: handle inlining directive from relative parent source 
file
76c661cc is described below

commit 76c661cc022d0080778559d3194217eec77e766c
Author: Florian Dold <florian@dold.me>
AuthorDate: Mon Oct 9 22:50:33 2023 +0200

    util: handle inlining directive from relative parent source file
---
 contrib/wallet-core                 | 2 +-
 util/src/main/kotlin/TalerConfig.kt | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/contrib/wallet-core b/contrib/wallet-core
index 27733d7a..2347be69 160000
--- a/contrib/wallet-core
+++ b/contrib/wallet-core
@@ -1 +1 @@
-Subproject commit 27733d7a7108594573a251880f812c9e91a2bb9f
+Subproject commit 2347be694c713959528ad59f3f157d866d7ad424
diff --git a/util/src/main/kotlin/TalerConfig.kt 
b/util/src/main/kotlin/TalerConfig.kt
index 7df9c036..9479404f 100644
--- 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.
      *

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.