From 4ae7b7ea691497b76b564f42a1974c202bfe368f Mon Sep 17 00:00:00 2001
From: Steve Holme <steve_holme@hotmail.com>
Date: Wed, 28 Aug 2013 18:56:19 +0100
Subject: [PATCH] ftpserver.pl: Added SELECT check to IMAP SEARCH command

---
 tests/ftpserver.pl | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index d5ae6bbf6..2732b1696 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -1034,28 +1034,33 @@ sub STATUS_imap {
 
 sub SEARCH_imap {
     my ($what) = @_;
-    my $testno = $selected;
     fix_imap_params($what);
 
-    logmsg "SEARCH_imap got test $testno\n";
+    if ($selected eq "") {
+        sendcontrol "$cmdid BAD Command received in Invalid state\r\n";
+    else {
+        my $testno = $selected;
 
-    $testno =~ s/^([^0-9]*)//;
-    my $testpart = "";
-    if ($testno > 10000) {
-        $testpart = $testno % 10000;
-        $testno = int($testno / 10000);
+        logmsg "SEARCH_imap got test $testno\n";
+
+        $testno =~ s/^([^0-9]*)//;
+        my $testpart = "";
+        if ($testno > 10000) {
+            $testpart = $testno % 10000;
+            $testno = int($testno / 10000);
+        }
+
+        loadtest("$srcdir/data/test$testno");
+
+        my @data = getpart("reply", "data$testpart");
+
+        for my $d (@data) {
+            sendcontrol $d;
+        }
+
+        sendcontrol "$cmdid OK SEARCH completed\r\n";
     }
 
-    loadtest("$srcdir/data/test$testno");
-
-    my @data = getpart("reply", "data$testpart");
-
-    for my $d (@data) {
-        sendcontrol $d;
-    }
-
-    sendcontrol "$cmdid OK SEARCH completed\r\n";
-
     return 0;
 }