From 293588673428d5e3c08d30b5a1a3b6246a5bec3a Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Tue, 10 Mar 2009 22:09:16 +0100
Subject: fix segfault caused by loop
---
src/core/libs/lib-misc.sh | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/core/libs/lib-misc.sh b/src/core/libs/lib-misc.sh
index ef7a000..c30e4cb 100644
--- a/src/core/libs/lib-misc.sh
+++ b/src/core/libs/lib-misc.sh
@@ -50,7 +50,7 @@ wait_for ()
# $2 set (array) haystack
check_is_in ()
{
- [ -z "$1" ] && debug 'MISC' "check_is_in $1 $2" && die_error "check_is_in needs a non-empty needle as \$1 and a haystack as \$2!" # haystack can be empty though
+ [ -z "$1" ] && die_error "check_is_in needs a non-empty needle as \$1 and a haystack as \$2!(got: check_is_in '$1' '$2'" # haystack can be empty though
NEEDLE=$1
HAYSTACK=$2
@@ -58,10 +58,8 @@ check_is_in ()
shift
for element
do
- [[ $element = $pattern ]] && debug 'MISC' "Checking if $element = $pattern ..yes !" && return 0
- debug 'MISC' "Checking if $element = $pattern ... no"
+ [[ $element = $pattern ]] && return 0
done
- debug 'MISC' "Check_is_in could not find $NEEDLE in $HAYSTACK"
return 1
}
--
cgit v1.2.3-54-g00ecf