Added two missing dir.exists() checks, without which a segfault occurs if m_currentDir doesnt exist.

1 files changed, 4 insertions, 0 deletions

diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index 6a6a300..7481360 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -1077,223 +1077,227 @@ void OFileSelector::slotClicked( int button, QListViewItem *item, const QPoint &
   case EXTENDED_ALL:{
     OFileSelectorItem *sel = (OFileSelectorItem*)item;
     if(!sel->isLocked() ){
       QStringList str = QStringList::split("->", sel->text(1) );
       if( sel->isDir() ){
 	cd( sel->directory() + "/" + str[0].stripWhiteSpace() );
 	// if MODE Dir m_shLne set the Text
       }else{
 	if( m_shLne )
 	  m_edit->setText(  str[0].stripWhiteSpace() );
         qWarning("selected here in slot clicked");
 	emit fileSelected( sel->directory() + "/" + str[0].stripWhiteSpace() );
 	DocLnk lnk( sel->directory() + "/" + str[0].stripWhiteSpace() );
         qWarning("file selected");
 	emit fileSelected( lnk );
       }
     }
     break;
   }
   }
 }
 void OFileSelector::slotRightButton(int button, QListViewItem *item, const QPoint &, int )
 {
   if( item == 0 )
     return;
 
   if( button != Qt::RightButton )
     return;
   slotContextMenu( item );
 }
 void OFileSelector::slotContextMenu( QListViewItem * /*item*/)
 {
 
 }
 void OFileSelector::slotChangedDir()
 {
   OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem();
   if(sel->isDir() ){
     QStringList str = QStringList::split("->", sel->text(1) );
     cd( sel->directory() + "/" + str[0].stripWhiteSpace() );
   }
 }
 void OFileSelector::slotOpen()
 {
   OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem();
   if(!sel->isDir() ){
     QStringList str = QStringList::split("->", sel->text(1) );
     slotFileSelected( sel->directory() +"/" +str[0].stripWhiteSpace() );
     qWarning("slot open");
     // DocLnk lnk( sel->directory() + "/" + str[0].stripWhiteSpace() );
     //emit fileSelected( lnk );
   }
 }
 void OFileSelector::slotRescan()
 {
 
 }
 void OFileSelector::slotRename()
 {
   reparse();
 }
 void OFileSelector::slotDelete()
 {
   OFileSelectorItem *sel = (OFileSelectorItem*)m_View->currentItem();
   QStringList list = QStringList::split("->", sel->text(1) );
   if( sel->isDir() ){
     QString str = QString::fromLatin1("rm -rf ") + sel->directory() +"/" + list[0]; //better safe than sorry
     switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+list[0],
                                   tr("Yes"),tr("No"),0,1,1) ) {
     case 0:
       ::system(str.utf8().data() );
     break;
     }
   } else {
     QFile::remove( list[0] );
   }
   m_View->takeItem( sel );
   delete sel;
 }
 void OFileSelector::cdUP()
 {
   QDir dir( m_currentDir );
   dir.cdUp();
   if(dir.exists() ){
     m_currentDir = dir.absPath();
     reparse();
     int count = m_location->count();
     slotInsertLocationPath( m_currentDir, count);
     m_location->setCurrentItem( indexByString( m_location, m_currentDir));
     //this wont work in all instances
     // FIXME
   }
 }
 void OFileSelector::slotHome()
 {
   cd(QDir::homeDirPath() );
 }
 void OFileSelector::slotDoc()
 {
   cd(QPEApplication::documentDir() );
 }
 void OFileSelector::slotNavigate( )
 {
 
 }
 // fill the View with life
 void OFileSelector::reparse()
 {
   if( m_selector == NORMAL )
     return;
   if( m_selector == EXTENDED || m_selector == EXTENDED_ALL )
     m_View->clear();
   else // custom view
     ; // currentView()->clear();
   if( m_shChooser)
     qWarning("reparse %s", m_mimeCheck->currentText().latin1() );
 
   QString currentMimeType;
   // let's update the mimetype
   if( m_autoMime ){
     m_mimetypes.clear();
     // ok we can change mimetype so we need to be able to give a selection
     if( m_shChooser ) {
       currentMimeType = m_mimeCheck->currentText();
       m_mimeCheck->clear();
 
       // let's find possible mimetypes
       QDir dir( m_currentDir );
+      if( dir.exists() ){
       dir.setFilter( QDir::Files | QDir::Readable );
       dir.setSorting( QDir::Size );
       const QFileInfoList *list = dir.entryInfoList();
       QFileInfoListIterator it( *list );
       QFileInfo *fi;
       while( (fi=it.current() ) ) {
 	if( fi->extension() == QString::fromLatin1("desktop") ){
 	  ++it;
 	  continue;
 	}
 	MimeType type( fi->absFilePath() );
 	if( !m_mimetypes.contains( type.id() ) ){
 	  //qWarning("Type %s", type.id().latin1() );
 	  m_mimetypes.insert( type.id(), type.id() );
 	}
 
 	++it;
       }
       // add them to the chooser
       updateMimeCheck();
       m_mimeCheck->setCurrentItem( indexByString( m_mimeCheck, currentMimeType ) );
       currentMimeType = m_mimeCheck->currentText();
     }
+    }
   }else { // no autoMime
       // let the mimetype be set from out side the m_mimeCheck FEATURE
 
     if( m_shChooser ){
         currentMimeType = m_mimeCheck->currentText();
 //        updateMimeCheck();
     }
   }
   // now we got our mimetypes we can add the files
 
   QDir dir( m_currentDir );
 
+  if( dir.exists() ){
   int sort;
   if ( m_case )
     sort = (QDir::IgnoreCase | QDir::Name | QDir::DirsFirst | QDir::Reversed);
   else
     sort = (QDir::Name | QDir::DirsFirst | QDir::Reversed);
   dir.setSorting( sort );
 
   int filter;
   if( m_selector == EXTENDED_ALL /*|| m_selector ==CUSTOM_ALL */ ){
     filter = QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All;
   }else
     filter = QDir::Files | QDir::Dirs | QDir::All;
   dir.setFilter( filter );
 
   // now go through all files
   const QFileInfoList *list = dir.entryInfoList();
   QFileInfoListIterator it( *list );
   QFileInfo *fi;
   while( (fi=it.current() ) ){
     //qWarning("True and only" );
     if( fi->fileName() == QString::fromLatin1("..") || fi->fileName() == QString::fromLatin1(".") ){
       //qWarning(".. or ." );
       ++it;
       continue;
     }
     if( fi->isSymLink() ){
       QString file = fi->dirPath( true ) + "/" + fi->readLink();
       for( int i = 0; i<=4; i++) { // 5 tries to prevent dos
 	QFileInfo info( file );
 	if( !info.exists() ){
 	  addSymlink( currentMimeType, fi, TRUE );
 	  break;
 	}else if( info.isDir() ){
 	  addDir( currentMimeType, fi, TRUE );
 	  break;
 	}else if( info.isFile() ){
 	  addFile( currentMimeType, fi, TRUE );
 	  break;
 	}else if( info.isSymLink() ){
 	  file = info.dirPath(true ) + "/" + info.readLink() ;
 	  break;
 	}else if( i == 4){
 	  addSymlink( currentMimeType, fi );
 	}
       } // off for loop
     }else if( fi->isDir() ){
       addDir( currentMimeType, fi );
     }else if( fi->isFile() ){
       addFile( currentMimeType, fi );
     }
     //qWarning( "%s", fi->fileName().latin1() );
     ++it;
   } // of while loop
+  } // if ( dir.exists() )
   m_View->sort();
   if( m_shTool ){
     m_location->insertItem( m_currentDir );
 
   }
   // reenable painting and updates
 }