From: Michael Prokop <mika@grml.org>
Date: Fri, 7 Aug 2009 11:35:47 +0000 (+0200)
Subject: Make sure to accept only integers in _setDebugLevel()
X-Git-Tag: v1.03.1^0
X-Git-Url: http://git.grml.org/?p=grml-shlib.git;a=commitdiff_plain;h=3d807fbf9c10f92022db66d582984c711cb2737c

Make sure to accept only integers in _setDebugLevel()
---

diff --git a/debian/changelog b/debian/changelog
index d4ca9de..ab5822b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,17 @@
 grml-shlib (1.03.1) unstable; urgency=low
 
   * Fix bashisms.
+  * Make sure to accept only integers in _setDebugLevel().
   * Debian packaging updates:
     - Update build-depend to dh >=5
     - Bump Standard-Version to 3.8.2 (no further changes)
     - Switch binary-indep/binary-arch
     - Adjust long description
     - Bump compat version to 5
+    - Adjust VCS headers
     - Adjust copyright file (reference specific GPL version)
 
- -- Michael Prokop <mika@grml.org>  Fri, 07 Aug 2009 12:49:09 +0200
+ -- Michael Prokop <mika@grml.org>  Fri, 07 Aug 2009 13:35:19 +0200
 
 grml-shlib (1.02.13) unstable; urgency=low
 
diff --git a/sh-lib b/sh-lib
index 15f15ff..1975585 100644
--- a/sh-lib
+++ b/sh-lib
@@ -69,7 +69,7 @@ vprint()
   local type_="$2"
   local message_="$3"
 
-  if [ $VERBOSE__ -ge $level_ -a -n "$message_" ]; then
+  if [ "$VERBOSE__" -ge "$level_" -a -n "$message_" ]; then
     echo -n "$type_" >&2
     echo "$message_" >&2
   fi
@@ -285,8 +285,8 @@ checkId()
 
   local user_id_=''
 
-  user_id_=`id -u`
-  if [ $user_id_ != "$to_check_" ]; then
+  user_id_=$(id -u)
+  if [ "$user_id_" != "$to_check_" ]; then
     if [ -z "$message_" ]; then
       $error_function_ "UID \"$user_id_\" is not \"$to_check_\"" 77
     else
@@ -727,10 +727,14 @@ _checkBootParam()
 }
 _checkBootParam
 
-
 _setDebugLevel()
 {
-  local debug_="${DEBUG:-0}"
+  # accept only integer as arguments
+  if echo "$DEBUG" | grep -E -q '^[0-9]+$' ; then
+    local debug_="${DEBUG:-0}"
+  else
+    local debug_="0"
+  fi
   VERBOSE__="$debug_"
 }
 _setDebugLevel