Fix bug 1219.

If not authorized no dtp is created
so 0x000000000->close is likely to fail.

lpotter something I think Qtopia suffers from as well

1 files changed, 3 insertions, 1 deletions

diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp
index eea9f3a..9519d11 100644
--- a/core/launcher/transferserver.cpp
+++ b/core/launcher/transferserver.cpp
@@ -252,193 +252,195 @@ bool SyncAuthentication::checkPassword( const QString& password )
 	    }
 	}
 
 	// Unrecognized system. Be careful...
 	QMessageBox unrecbox(
 	    tr("Sync Connection"),
 	    tr(	"<p>An unrecognized system is requesting access to this device."
 		"<p>If you have just initiated a Sync for the first time, this is normal."),
 		QMessageBox::Warning,
 		QMessageBox::Cancel, QMessageBox::Yes, QMessageBox::NoButton,
 		0, QString::null, TRUE, WStyle_StaysOnTop);
 	unrecbox.setButtonText(QMessageBox::Cancel, tr("Deny"));
 	unrecbox.setButtonText(QMessageBox::Yes, tr("Allow"));
 
 	if ( (denials > 2 && now < lastdenial+600)
 	    || unrecbox.exec() != QMessageBox::Yes)
 	{
 	    denials++;
 	    lastdenial=now;
 	    lock--;
 	    return FALSE;
 	} else {
 	    const char salty[]="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/.";
 	    char salt[2];
 	    salt[0]= salty[rand() % (sizeof(salty)-1)];
 	    salt[1]= salty[rand() % (sizeof(salty)-1)];
 #ifndef Q_OS_WIN32
 	    QString cpassword = QString::fromLocal8Bit(
 		crypt( password.mid(8).local8Bit(), salt ) );
 #else
 	    //### revise
 	    QString cpassword("");
 #endif
 	    denials=0;
 	    pwds.prepend(cpassword);
 	    cfg.writeEntry("Passwords",pwds,' ');
 	    lock--;
 	    return TRUE;
 	}
     }
     lock--;
 
     return FALSE;
 }
 
 
 ServerPI::ServerPI( int socket, QObject *parent, const char* name )
     : QSocket( parent, name ) , dtp( 0 ), serversocket( 0 ), waitsocket( 0 ),
       storFileSize(-1)
 {
     state = Connected;
 
     setSocket( socket );
 
     peerport = peerPort();
     peeraddress = peerAddress();
 
 #ifndef INSECURE
     if ( !SyncAuthentication::isAuthorized(peeraddress) ) {
 	state = Forbidden;
 	startTimer( 0 );
     } else
 #endif
     {
 	connect( this, SIGNAL( readyRead() ), SLOT( read() ) );
 	connect( this, SIGNAL( connectionClosed() ), SLOT( connectionClosed() ) );
 
 	passiv = FALSE;
 	for( int i = 0; i < 4; i++ )
 	    wait[i] = FALSE;
 
 	send( "220 Qtopia " QPE_VERSION " FTP Server" ); // No tr
 	state = Wait_USER;
 
 	dtp = new ServerDTP( this );
 	connect( dtp, SIGNAL( completed() ), SLOT( dtpCompleted() ) );
 	connect( dtp, SIGNAL( failed() ), SLOT( dtpFailed() ) );
 	connect( dtp, SIGNAL( error( int ) ), SLOT( dtpError( int ) ) );
 
 
 	directory = QDir::currentDirPath();
 
 	static int p = 1024;
 
 	while ( !serversocket || !serversocket->ok() ) {
 	    delete serversocket;
 	    serversocket = new ServerSocket( ++p, this );
 	}
 	connect( serversocket, SIGNAL( newIncomming( int ) ),
 		 SLOT( newConnection( int ) ) );
     }
 }
 
 ServerPI::~ServerPI()
 {
     close();
-    dtp->close();
+
+    if ( dtp )
+        dtp->close();
     delete dtp;
     delete serversocket;
 }
 
 bool ServerPI::verifyAuthorised()
 {
     if ( !SyncAuthentication::isAuthorized(peerAddress()) ) {
 	state = Forbidden;
 	return FALSE;
     }
     return TRUE;
 }
 
 void ServerPI::connectionClosed()
 {
     // qDebug( "Debug: Connection closed" );
     emit connectionClosed(this);
 }
 
 void ServerPI::send( const QString& msg )
 {
     QTextStream os( this );
     os << msg << endl;
     //qDebug( "Reply: %s", msg.latin1() );
 }
 
 void ServerPI::read()
 {
     while ( canReadLine() )
 	process( readLine().stripWhiteSpace() );
 }
 
 bool ServerPI::checkReadFile( const QString& file )
 {
     QString filename;
 
     if ( file[0] != "/" )
 	filename = directory.path() + "/" + file;
     else
 	filename = file;
 
     QFileInfo fi( filename );
     return ( fi.exists() && fi.isReadable() );
 }
 
 bool ServerPI::checkWriteFile( const QString& file )
 {
     QString filename;
 
     if ( file[0] != "/" )
 	filename = directory.path() + "/" + file;
     else
 	filename = file;
 
     QFileInfo fi( filename );
 
     if ( fi.exists() )
 	if ( !QFile( filename ).remove() )
 	    return FALSE;
     return TRUE;
 }
 
 void ServerPI::process( const QString& message )
 {
     //qDebug( "Command: %s", message.latin1() );
 
     // split message using "," as separator
     QStringList msg = QStringList::split( " ", message );
     if ( msg.isEmpty() ) return;
 
     // command token
     QString cmd = msg[0].upper();
 
     // argument token
     QString arg;
     if ( msg.count() >= 2 )
 	arg = msg[1];
 
     // full argument string
     QString args;
     if ( msg.count() >= 2 ) {
         QStringList copy( msg );
         // FIXME: for Qt3
         // copy.pop_front()
         copy.remove( copy.begin() );
         args = copy.join( " " );
     }
 
     //qDebug( "args: %s", args.latin1() );
 
     // we always respond to QUIT, regardless of state
     if ( cmd == "QUIT" ) {
 	send( "211 Good bye!" ); // No tr
 	close();
 	return;
     }