From 142dd17f5b7fbc4b2cd94f2af5bde1edfdb135be Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sun, 6 Aug 2023 13:15:12 -0400 Subject: machine file: Fix crash on empty value Fixes: #12025 --- mesonbuild/coredata.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 54d9b1d..e930dff 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -992,9 +992,11 @@ class MachineFileParser(): value = value.replace('\\', '\\\\') try: ast = mparser.Parser(value, 'machinefile').parse() + if not ast.lines: + raise EnvironmentException('value cannot be empty') res = self._evaluate_statement(ast.lines[0]) - except MesonException: - raise EnvironmentException(f'Malformed value in machine file variable {entry!r}.') + except MesonException as e: + raise EnvironmentException(f'Malformed value in machine file variable {entry!r}: {str(e)}.') except KeyError as e: raise EnvironmentException(f'Undefined constant {e.args[0]!r} in machine file variable {entry!r}.') section[entry] = res -- cgit v1.1