Fix to prevent segfault when no process/module is selected in list.

2 files changed, 11 insertions, 1 deletions

diff --git a/noncore/settings/sysinfo/modulesinfo.cpp b/noncore/settings/sysinfo/modulesinfo.cpp
index 8b58fe9..29cce90 100644
--- a/noncore/settings/sysinfo/modulesinfo.cpp
+++ b/noncore/settings/sysinfo/modulesinfo.cpp
@@ -109,32 +109,37 @@ void ModulesInfo::updateData()
                 break;
 
             QString qmodname = QString( modname );
             QString qmodsize = QString::number( modsize ).rightJustify( 6, ' ' );
             QString qusecount = QString::number( usecount ).rightJustify( 2, ' ' );
             QString qusage = QString( usage );
 
             ( void ) new QListViewItem( ModulesView, qmodname, qmodsize, qusecount, qusage );
         }
 
         fclose( procfile );
     }
 }
 
 void ModulesInfo::slotSendClicked()
 {
+	if ( !ModulesView->currentItem() )
+	{
+		return;
+	}
+	
 	QString capstr = tr( "You really want to execute\n" );
 	capstr.append( CommandCB->currentText() );
 	capstr.append( "\nfor this module?" );
 
 	QString modname = ModulesView->currentItem()->text( 0 );
 	
     if ( QMessageBox::warning( this, modname, capstr,
          QMessageBox::Yes | QMessageBox::Default, QMessageBox::No | QMessageBox::Escape ) == QMessageBox::Yes )
     {
 		QString command = "/sbin/";
 		command.append( CommandCB->currentText() );
 		command.append( " " );
 		command.append( modname );
 
         FILE* stream = popen( command, "r" );
         if ( stream )
diff --git a/noncore/settings/sysinfo/processinfo.cpp b/noncore/settings/sysinfo/processinfo.cpp
index 35d7ba1..9a5446a 100644
--- a/noncore/settings/sysinfo/processinfo.cpp
+++ b/noncore/settings/sysinfo/processinfo.cpp
@@ -131,37 +131,42 @@ void ProcessInfo::updateData()
                     QString processtime = QString::number( ( utime + stime ) / 100 );
                     processtime = processtime.rightJustify( 9, ' ' );
                     fclose( procfile );
 
                     ( void ) new QListViewItem( ProcessView, processnum, processcmd, processstatus, processtime );
                 }
             }
         }
     }
 
     delete proclist;
     delete procdir;
 }
 
 void ProcessInfo::slotSendClicked()
 {
+	QListViewItem *currprocess = ProcessView->currentItem();
+	if ( !currprocess )
+	{
+		return;
+	}
+	
 	QString capstr = tr( "You really want to send\n" );
 	capstr.append( SignalCB->currentText() );
 	capstr.append( "\nto this process?" );
 
-	QListViewItem *currprocess = ProcessView->currentItem();
 	
     if ( QMessageBox::warning( this, currprocess->text( 1 ), capstr,
          QMessageBox::Yes | QMessageBox::Default, QMessageBox::No | QMessageBox::Escape ) == QMessageBox::Yes )
 	{
 		QString sigstr = SignalCB->currentText();
 		sigstr.truncate(2);
 		int sigid = sigstr.toUInt();
         if ( kill( currprocess->text( 0 ).stripWhiteSpace().toUInt(), sigid ) == 0 )
         {
             hide();
         }
     }
 
 }
 
 void ProcessInfo::viewProcess( QListViewItem *process )