[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.2.10-62-gd7fb22c



The following commit has been merged in the master branch:
commit 2fcf34688a04002078532f88fca7cdf8e1f4ef4c
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date:   Thu May 28 20:50:08 2009 +0100

    Detect shellscript wrappers embedding exec inside conditionals
    
    * checks/scripts:
      + [ADB] Detect shellscript wrappers which embed a call to "exec" in a
        conditional statement.  Thanks, Raphael Geissert.

diff --git a/checks/scripts b/checks/scripts
index c5d9a67..8440d2b 100644
--- a/checks/scripts
+++ b/checks/scripts
@@ -1055,7 +1055,7 @@ sub script_is_evil_and_wrong {
 	last if (++$i > 55);
 	if (m~
             # the exec should either be "eval"ed or a new statement
-            (^\s*|\beval\s*[\'\"]|(;|&&)\s*)
+            (^\s*|\beval\s*[\'\"]|(;|&&|\b(then|else))\s*)
 
             # eat anything between the exec and $0
             exec\s*.+\s*
@@ -1092,7 +1092,7 @@ sub script_is_evil_and_wrong {
 	    $backgrounded = 1;
 	} elsif ($backgrounded and m~
 	    # the exec should either be "eval"ed or a new statement
-	    (^\s*|\beval\s*[\'\"]|(;|&&)\s*)
+	    (^\s*|\beval\s*[\'\"]|(;|&&|\b(then|else))\s*)
 	    exec\s+true(\s|\Z)~x) {
 
 	    $ret = $1;
diff --git a/debian/changelog b/debian/changelog
index 519ce33..604de1f 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,8 @@ lintian (2.2.11) UNRELEASED; urgency=low
       /usr/bin/pike and /usr/bin/pikeX.Y but there is no "pike" package.
     + [ADB] Add ksh and zsh to the list of packages providing the /bin/ksh
       alternative.  Thanks, Guillaume Delacour.  (Closes: #529457)
+    + [ADB] Detect shellscript wrappers which embed a call to "exec" in a
+      conditional statement.  Thanks, Raphael Geissert.
   * checks/shared-libs.desc:
     + [RA] Downgrade certainty of tags for which we recommend overrides.
       Patch from Raphael Geissert.

-- 
Debian package checker


Reply to: