Bug#361588: filtergen 0.12.4-4.1 NMU

[Matej Vela]

Hello,

I'm doing an NMU of filtergen to fix #324908, #359983, and #361588;
diff attached.

Thanks,

Matej

diff -u filtergen-0.12.4/debian/changelog filtergen-0.12.4/debian/changelog
--- filtergen-0.12.4/debian/changelog
+++ filtergen-0.12.4/debian/changelog
@@ -1,3 +1,13 @@
+filtergen (0.12.4-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * scanner.l: Fix buffer overflow with nested include files.
+    Closes: #324908.
+  * debian/rules: Make sure clean doesn't accidentally run makefile
+    (and consequently autoconf).
+
+ -- Matej Vela <[EMAIL PROTECTED]>  Wed,  5 Jul 2006 08:40:35 +0200
+
 filtergen (0.12.4-4) unstable; urgency=low
 
   * Apply patch from Andreas Jochens to fix build failure on amd64.
diff -u filtergen-0.12.4/debian/rules filtergen-0.12.4/debian/rules
--- filtergen-0.12.4/debian/rules
+++ filtergen-0.12.4/debian/rules
@@ -37,7 +37,7 @@
 clean:
        dh_testdir
        dh_testroot
-       -$(MAKE) distclean
+       [ ! -f Makefile ] || $(MAKE) distclean
        rm -f build-stamp configure-stamp
        dh_clean
 
diff -u filtergen-0.12.4/scanner.c filtergen-0.12.4/scanner.c
--- filtergen-0.12.4/scanner.c
+++ filtergen-0.12.4/scanner.c
@@ -1036,7 +1036,7 @@
 YY_RULE_SETUP
 #line 125 "scanner.l"
 { /* include file name */
-                          if (inc_stackptr >= MAXINCLUDES) {
+                          if (inc_stackptr >= MAXINCLUDES - 1) {
                               scan_err("warning: too many nested includes");
                              scan_err("warning: skipping include of file %s", 
yytext);
 
only in patch2:
unchanged:
--- filtergen-0.12.4.orig/scanner.l
+++ filtergen-0.12.4/scanner.l
@@ -123,7 +123,7 @@
 
 <include>[ \t]*       /* eat whitespace after include */
 <include>[^ \t\n;]+    { /* include file name */
-                          if (inc_stackptr >= MAXINCLUDES) {
+                          if (inc_stackptr >= MAXINCLUDES - 1) {
                               scan_err("warning: too many nested includes");
                              scan_err("warning: skipping include of file %s", 
yytext);