diff options
| author | Vili Väinölä <vilivainola@gmail.com> | 2022-06-01 18:31:33 +0300 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2022-06-01 12:32:53 -0700 |
| commit | 18e2f8b2b3c7b3cb29e7d7ff037b175411f47f25 (patch) | |
| tree | 8377bb862185c15f028b29389447e9482a7fd8e2 /mesonbuild/interpreter | |
| parent | eec7b2c359fe1ab2945c67465848294996bd2f9d (diff) | |
| download | meson-18e2f8b2b3c7b3cb29e7d7ff037b175411f47f25.zip meson-18e2f8b2b3c7b3cb29e7d7ff037b175411f47f25.tar.gz meson-18e2f8b2b3c7b3cb29e7d7ff037b175411f47f25.tar.bz2 | |
Fix sandbox violation when using subproject as a symlink
Fix "Tried to grab file outside current (sub)project" error when subproject exists within
a source tree but it is used through a symlink. Using subprojects as symlinks is very useful
feature when migrating an existing codebase to meson that all sources do not need to be
immediately moved to subprojects folder.
Diffstat (limited to 'mesonbuild/interpreter')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 05614aa..6e25b9b 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -2851,7 +2851,7 @@ Try setting b_lundef to false instead.'''.format(self.coredata.options[OptionKey # subproject files, as long as they are scheduled to be installed. if validate_installable_file(norm): return - norm = Path(srcdir, subdir, fname).resolve() + norm = Path(os.path.abspath(Path(srcdir, subdir, fname))) if os.path.isdir(norm): inputtype = 'directory' else: |