Each file in this commit has an instance where a pointer is checked at

one point in the code and then not checked in another point in the code.
If it needed to be checked once, it needs to be checked the other time. If not
the application could segfault.

1 files changed, 1 insertions, 1 deletions

diff --git a/noncore/settings/sysinfo/devicesinfo.cpp b/noncore/settings/sysinfo/devicesinfo.cpp
index 164d608..428cfd4 100644
--- a/noncore/settings/sysinfo/devicesinfo.cpp
+++ b/noncore/settings/sysinfo/devicesinfo.cpp
@@ -244,49 +244,49 @@ void UsbCategory::populate()
     int usbcount = 0;
     UsbDevice* lastDev = 0;
     UsbDevice* dev = 0;
     while ( !usbinfo.atEnd() )
     {
         QString line = usbinfo.readLine();
         odebug << "got line '" << line << "'" << oendl;
         if ( line.startsWith( "T:" ) )
         {
             sscanf(line.local8Bit().data(), "T:  Bus=%2d Lev=%2d Prnt=%2d Port=%d Cnt=%2d Dev#=%3d Spd=%3f MxCh=%2d", &_bus, &_level, &_parent, &_port, &_count, &_device, &_speed, &_channels);
 
             if ( !_level )
             {
                 odebug << "adding new bus" << oendl;
                 dev = new UsbDevice( this, QString( "Generic USB Hub Device" ) );
                 lastDev = dev;
             }
             else
             {
                 odebug << "adding new dev" << oendl;
                 dev = new UsbDevice( lastDev, QString( "Generic USB Hub Device" ) );
                 lastDev = dev;
             }
         }
-        else if ( line.startsWith( "S:  Product" ) )
+        else if ( dev && line.startsWith( "S:  Product" ) )
         {
             int dp = line.find( '=' );
             dev->setText( 0, dp != -1 ? line.right( line.length()-1-dp ) : "<unknown>" );
         }
         else
         {
             continue;
         }
     }
 }
 
 
 //=================================================================================================
 Device::Device( Category* parent, const QString& name )
        :OListViewItem( parent, name )
 {
     devinfo = static_cast<QWidget*>( listView()->parent() );
 }
 
 Device::Device( Device* parent, const QString& name )
        :OListViewItem( parent, name )
 {
     devinfo = static_cast<QWidget*>( listView()->parent() );
 }