Source cmdlineopts.clp from same folder as grml-debootstrap file (issue #59)
authorSebastian Pipping <sebastian@pipping.org>
Fri, 6 Mar 2015 15:51:06 +0000 (16:51 +0100)
committerMichael Prokop <mika@grml.org>
Tue, 10 Mar 2015 14:03:22 +0000 (15:03 +0100)
Simplified, this fixes CVE-2015-1378 for everyone but grml-debootstrap developers.

grml-debootstrap

index 2a27c46..f7b85eb 100755 (executable)
@@ -293,8 +293,9 @@ fi
 
 # cmdline handling {{{
 # source external command line parameter-processing script
 
 # cmdline handling {{{
 # source external command line parameter-processing script
-if [ -r ./cmdlineopts.clp ] ; then
-   . ./cmdlineopts.clp
+self_dir="$(dirname "$(which "$0")")"
+if [ -r "${self_dir}"/cmdlineopts.clp ] ; then
+   . "${self_dir}"/cmdlineopts.clp
 elif [ -r /usr/share/grml-debootstrap/functions/cmdlineopts.clp ] ; then
    . /usr/share/grml-debootstrap/functions/cmdlineopts.clp
 else
 elif [ -r /usr/share/grml-debootstrap/functions/cmdlineopts.clp ] ; then
    . /usr/share/grml-debootstrap/functions/cmdlineopts.clp
 else