Merge pull request #2890 from ximion/subproject_path_fix

Allow subproject dirs in subdirectories in the source tree again

1 files changed, 6 insertions, 2 deletions

diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 29b4033..48b8d82 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1883,10 +1883,14 @@ to directly access options of other subprojects.''')
             raise InvalidCode('Second call to project().')
         if not self.is_subproject() and 'subproject_dir' in kwargs:
             spdirname = kwargs['subproject_dir']
-            if '/' in spdirname or '\\' in spdirname:
-                raise InterpreterException('Subproject_dir must not contain a path segment.')
+            if not isinstance(spdirname, str):
+                raise InterpreterException('Subproject_dir must be a string')
+            if os.path.isabs(spdirname):
+                raise InterpreterException('Subproject_dir must not be an absolute path.')
             if spdirname.startswith('.'):
                 raise InterpreterException('Subproject_dir must not begin with a period.')
+            if '..' in spdirname:
+                raise InterpreterException('Subproject_dir must not contain a ".." segment.')
             self.subproject_dir = spdirname
 
         if 'meson_version' in kwargs: