[Dctrl-tools-devel] [SCM] Debian control file query tools branch, master, updated. 2.11-42-g20245f6

[Antti-Juhani Kaijanaho]

The following commit has been merged in the master branch:
commit 20245f6002bbb3be2a6fa5b781cdb438f2e8d92a
Author: Antti-Juhani Kaijanaho <ajk at debian.org>
Date:   Tue Jan 6 20:22:18 2009 +0200

    Fix #506138 by forbidding such messed up command lines.
    
    Signed-off-by: Antti-Juhani Kaijanaho <ajk at debian.org>

diff --git a/debian/changelog b/debian/changelog
index d995e3b..bc607f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,13 @@ dctrl-tools (2.14) UNRELEASED; urgency=low
     Closes: #508953 (when greping through source packages, 
                      tbl-control can't list Files
     Reported by Gerfried Fuchs <rhonda at debian.at>.
+  * tests/bug506138.{sh,out}: New test case.
+  * grep-dctrl.c [apptok]: Forbid mixing the predicate and input files.
+    It never worked, anyway.
+    Closes: #506138 (Segfault when calling with wrong order of parameters)
+    Reported by Marco Túlio Gontijo e Silva <marcot at holoscopio.com>.
 
- -- Antti-Juhani Kaijanaho <ajk at debian.org>  Tue, 06 Jan 2009 19:49:31 +0200
+ -- Antti-Juhani Kaijanaho <ajk at debian.org>  Tue, 06 Jan 2009 20:20:17 +0200
 
 dctrl-tools (2.13.0) unstable; urgency=low
 
diff --git a/grep-dctrl/grep-dctrl.c b/grep-dctrl/grep-dctrl.c
index 63936be..70a1fd1 100644
--- a/grep-dctrl/grep-dctrl.c
+++ b/grep-dctrl/grep-dctrl.c
@@ -297,6 +297,11 @@ static void leave(struct arguments * args, int paren)
 static void apptok(struct arguments * args, const int tok)
 {
 	debug_message("apptok", 0);
+        if (args->finished) {
+                message(L_FATAL, 0,
+                        _("file names are not allowed within the predicate"));
+                fail();
+        }
 	if (args->in_atom && tok < TOK_ATOM_BASE) {
 		finish_atom(args);
 	}

-- 
Debian control file query tools