From f4d7db71f976784cf98affd65063a5643e10a1dc Mon Sep 17 00:00:00 2001 From: "jake%acutex.net" <> Date: Sat, 6 Oct 2001 06:06:08 +0000 Subject: Fix for bug 57821 - Empty regular expression causes a software error. Patch by Nick Hibma r= jake@acutex.net --- editusers.cgi | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'editusers.cgi') diff --git a/editusers.cgi b/editusers.cgi index 48dcfa0c1..b1c1d01d6 100755 --- a/editusers.cgi +++ b/editusers.cgi @@ -292,20 +292,25 @@ List users with login name matching: if ($action eq 'list') { PutHeader("Select user"); my $query = ""; + my $matchstr = $::FORM{'matchstr'}; if (exists $::FORM{'matchtype'}) { $query = "SELECT login_name,realname,disabledtext " . "FROM profiles WHERE login_name "; if ($::FORM{'matchtype'} eq 'substr') { $query .= "like"; - $::FORM{'matchstr'} = '%' . $::FORM{'matchstr'} . '%'; + $matchstr = '%' . $matchstr . '%'; } elsif ($::FORM{'matchtype'} eq 'regexp') { $query .= "regexp"; + $matchstr = '.' + unless $matchstr; } elsif ($::FORM{'matchtype'} eq 'notregexp') { $query .= "not regexp"; + $matchstr = '.' + unless $matchstr; } else { die "Unknown match type"; } - $query .= SqlQuote($::FORM{'matchstr'}) . " ORDER BY login_name"; + $query .= SqlQuote($matchstr) . " ORDER BY login_name"; } elsif (exists $::FORM{'query'}) { $query = "SELECT login_name,realname,disabledtext " . "FROM profiles WHERE " . $::FORM{'query'} . " ORDER BY login_name"; -- cgit v1.2.3-24-g4f1b