From 8d743ac19a1b0c15deccfb14525eaeef56b4135b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 2 Jan 2018 14:28:10 +0200
Subject: Fix few undefined behavior (ubsan) bugs

---
 build2/test/script/script.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'build2/test/script/script.cxx')

diff --git a/build2/test/script/script.cxx b/build2/test/script/script.cxx
index 5a9ad3c..99ace23 100644
--- a/build2/test/script/script.cxx
+++ b/build2/test/script/script.cxx
@@ -435,9 +435,9 @@ namespace build2
       // scope
       //
       scope::
-      scope (const string& id, scope* p)
+      scope (const string& id, scope* p, script* r)
           : parent (p),
-            root (p != nullptr ? p->root : static_cast<script*> (this)),
+            root (r),
             vars (false /* global */),
             id_path (cast<path> (assign (root->id_var) = path ())),
             wd_path (cast<dir_path> (assign (root->wd_var) = dir_path ()))
@@ -528,7 +528,7 @@ namespace build2
       //
       script::
       script (const target& tt, const testscript& st, const dir_path& rwd)
-          : group (st.name == "testscript" ? string () : st.name),
+          : group (st.name == "testscript" ? string () : st.name, this),
             test_target (tt),
             script_target (st)
       {
-- 
cgit v1.1