From 60a31902d632b3e76dc8719047fd63d5d6ec6338 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 14 Aug 2017 20:14:29 +0200
Subject: Skip invalid paths when trying to remap generated headers

---
 build2/cc/compile.cxx | 102 ++++++++++++++++++++++++++++----------------------
 1 file changed, 57 insertions(+), 45 deletions(-)

(limited to 'build2')

diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx
index 21fa4b7..a62ce4a 100644
--- a/build2/cc/compile.cxx
+++ b/build2/cc/compile.cxx
@@ -1631,66 +1631,78 @@ namespace build2
               else
                 ds.assign (o + 2, n - 2);
 
-              // Note that we don't normalize the paths since it would be
-              // quite expensive and normally the pairs we are inerested in
-              // are already normalized (since usually specified as
-              // -I$src/out_*).
-              //
-              // @@ Maybe we should ignore any paths containing '.', '..'
-              // components for safety.
-              //
-              dir_path d (move (ds)); // Move the buffer in.
-
-              if (d.absolute ())
+              if (!ds.empty ())
               {
-                // If we have a candidate out_base, see if this is its
-                // src_base.
+                // Note that we don't normalize the paths since it would be
+                // quite expensive and normally the pairs we are inerested in
+                // are already normalized (since usually specified as
+                // -I$src/out_*).
                 //
-                if (s != nullptr)
-                {
-                  const dir_path& bp (s->src_path ());
+                dir_path d (move (ds), dir_path::exact); // Move the buffer in.
 
-                  if (d.sub (bp))
+                // Ignore invalid paths (buffer is not moved).
+                //
+                if (!d.empty ())
+                {
+                  // Ignore any paths containing '.', '..' components wrong
+                  // separators, etc.
+                  //
+                  if (d.absolute () && d.normalized ())
                   {
-                    if (p.empty () || d.leaf (bp) == p)
+                    // If we have a candidate out_base, see if this is its
+                    // src_base.
+                    //
+                    if (s != nullptr)
                     {
-                      // We've got a pair.
+                      const dir_path& bp (s->src_path ());
+
+                      if (d.sub (bp))
+                      {
+                        if (p.empty () || d.leaf (bp) == p)
+                        {
+                          // We've got a pair.
+                          //
+                          so_map.emplace (move (d), s->out_path () / p);
+                          continue;
+                        }
+                      }
+
+                      // Not a pair. Fall through to consider as out_base.
                       //
-                      so_map.emplace (move (d), s->out_path () / p);
-                      continue;
+                      s = nullptr;
                     }
-                  }
 
-                  // Not a pair. Fall through to consider as out_base.
-                  //
-                  s = nullptr;
-                }
-
-                // See if this path is inside a project with an out-of-tree
-                // build and is in the out directory tree.
-                //
-                const scope& bs (scopes.find (d));
-                if (bs.root_scope () != nullptr)
-                {
-                  const dir_path& bp (bs.out_path ());
-                  if (bp != bs.src_path ())
-                  {
-                    bool e;
-                    if ((e = (d == bp)) || d.sub (bp))
+                    // See if this path is inside a project with an out-of-
+                    // tree build and is in the out directory tree.
+                    //
+                    const scope& bs (scopes.find (d));
+                    if (bs.root_scope () != nullptr)
                     {
-                      s = &bs;
-                      if (e)
-                        p.clear ();
-                      else
-                        p = d.leaf (bp);
+                      const dir_path& bp (bs.out_path ());
+                      if (bp != bs.src_path ())
+                      {
+                        bool e;
+                        if ((e = (d == bp)) || d.sub (bp))
+                        {
+                          s = &bs;
+                          if (e)
+                            p.clear ();
+                          else
+                            p = d.leaf (bp);
+                        }
+                      }
                     }
                   }
+                  else
+                    s = nullptr;
+
+                  ds = move (d).string (); // Move the buffer out.
                 }
+                else
+                  s = nullptr;
               }
               else
                 s = nullptr;
-
-              ds = move (d).string (); // Move the buffer out.
             }
           }
 
-- 
cgit v1.1