diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-01-30 21:30:07 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-01-30 21:30:07 +0200 |
commit | 96400fa1a354c8ea062f11d0f1f52d3ec8ffb4a9 (patch) | |
tree | f038b0d219a10659043cf1a2755e946dc4b15a46 | |
parent | 2cf85ae16f79b5edcbfa34d57b477c984c79e7a5 (diff) | |
download | meson-namerobusting.tar.gz |
Make checks a bit more robust against empty entries.namerobusting
-rw-r--r-- | mesonbuild/build.py | 4 | ||||
-rw-r--r-- | mesonbuild/interpreter.py | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 98fd764ae..dc19b736e 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1637,6 +1637,10 @@ class CustomTarget(Target): for i in self.outputs: if not(isinstance(i, str)): raise InvalidArguments('Output argument not a string.') + if i == '': + raise InvalidArguments('Output must not be empty.') + if i.strip() == '': + raise InvalidArguments('Output must not consist only of whitespace.') if '/' in i: raise InvalidArguments('Output must not contain a path segment.') if '@INPUT@' in i or '@INPUT0@' in i: diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index edcb92c84..9c2fd00c9 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -3006,6 +3006,8 @@ different subdirectory. def add_target(self, name, tobj): if name == '': raise InterpreterException('Target name must not be empty.') + if name.strip() == '': + raise InterpreterException('Target name must not consist only of whitespace.') if name.startswith('meson-'): raise InvalidArguments("Target names starting with 'meson-' are reserved " "for Meson's internal use. Please rename.") |