From 3a84136268392a09be671af3fc228761a4d25cff Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Fri, 11 Nov 2016 11:13:39 +0530
Subject: [PATCH] Fix regex used in custom target evaluation

Instead of using a whitelist, use a blacklist. Also print a more useful
error if the regex fails to match.

Use an underscore in the gir test to trigger this.

Fixes #436
---
 mesonbuild/backend/backends.py                    | 10 ++++++++--
 test cases/frameworks/7 gnome/gir/meson.build     |  2 +-
 test cases/frameworks/7 gnome/installed_files.txt |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index d7996164c..45d946fce 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -601,11 +601,17 @@ class Backend():
                 i = i.replace('@OUTDIR@', outdir)
             elif '@DEPFILE@' in i:
                 if target.depfile is None:
-                    raise MesonException('Custom target %s has @DEPFILE@ but no depfile keyword argument.' % target.name)
+                    msg = 'Custom target {!r} has @DEPFILE@ but no depfile ' \
+                          'keyword argument.'.format(target.name)
+                    raise MesonException(msg)
                 dfilename = os.path.join(outdir, target.depfile)
                 i = i.replace('@DEPFILE@', dfilename)
             elif '@PRIVATE_OUTDIR_' in i:
-                match = re.search('@PRIVATE_OUTDIR_(ABS_)?([-a-zA-Z0-9.@:]*)@', i)
+                match = re.search('@PRIVATE_OUTDIR_(ABS_)?([^\/\s*]*)@', i)
+                if not match:
+                    msg = 'Custom target {!r} has an invalid argument {!r}' \
+                          ''.format(target.name, i)
+                    raise MesonException(msg)
                 source = match.group(0)
                 if match.group(1) is None and not absolute_paths:
                     lead_dir = ''
diff --git a/test cases/frameworks/7 gnome/gir/meson.build b/test cases/frameworks/7 gnome/gir/meson.build
index a5130621d..51bbbab54 100644
--- a/test cases/frameworks/7 gnome/gir/meson.build	
+++ b/test cases/frameworks/7 gnome/gir/meson.build	
@@ -1,7 +1,7 @@
 libsources = ['meson-sample.c', 'meson-sample.h']
 
 girlib = shared_library(
-  'girlib',
+  'gir_lib',
   sources : libsources,
   dependencies : gobj,
   install : true
diff --git a/test cases/frameworks/7 gnome/installed_files.txt b/test cases/frameworks/7 gnome/installed_files.txt
index c922f8baf..a18e4450d 100644
--- a/test cases/frameworks/7 gnome/installed_files.txt	
+++ b/test cases/frameworks/7 gnome/installed_files.txt	
@@ -3,6 +3,6 @@ usr/include/enums2.h
 usr/include/enums3.h
 usr/include/marshaller.h
 usr/lib/girepository-1.0/Meson-1.0.typelib
-usr/lib/libgirlib.so
+usr/lib/libgir_lib.so
 usr/share/gir-1.0/Meson-1.0.gir
 usr/share/glib-2.0/schemas/com.github.meson.gschema.xml