Fix few undefined behavior (ubsan) bugs

1 files changed, 7 insertions, 1 deletions

diff --git a/build2/install/functions.cxx b/build2/install/functions.cxx
index b9298b2..dbe43c8 100644
--- a/build2/install/functions.cxx
+++ b/build2/install/functions.cxx
@@ -21,7 +21,13 @@ namespace build2
       // Resolve potentially relative install.* value to an absolute directory
       // based on (other) install.* values visible from the calling scope.
       //
-      f["resolve"] = &resolve_dir;
+      f[".resolve"] = [] (const scope* s, dir_path d)
+      {
+        if (s == nullptr)
+          fail << "install.resolve() called out of scope" << endf;
+
+        return resolve_dir (*s, move (d));
+      };
     }
   }
 }