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.

8 files changed, 83 insertions, 74 deletions

diff --git a/libopie2/opieui/big-screen/osplitter.cpp b/libopie2/opieui/big-screen/osplitter.cpp
index 78e919a..5d1e2cf 100644
--- a/libopie2/opieui/big-screen/osplitter.cpp
+++ b/libopie2/opieui/big-screen/osplitter.cpp
@@ -224,13 +224,13 @@ void OSplitter::addWidget( QWidget* wid, const QString& icon, const QString& lab
     if (!m_splitter.isEmpty() && (m_tabWidget || m_parentTab ) )
         setTabWidget( m_parentTab );
     else
     {
         if (m_hbox )
             addToBox( cont );
-        else
+        else if (m_tabWidget)
             addToTab( cont );
     }
 }
 
 
 /**
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 34f5e6a..d959c7a 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1766,18 +1766,18 @@ void QPEApplication::showMainWidget( QWidget* mw, bool nomaximize )
   The \a mw widget \e must have this slot: setDocument(const QString&).
 
   \sa showMainWidget()
 */
 void QPEApplication::showMainDocumentWidget( QWidget* mw, bool nomaximize )
 {
-    if ( mw && argc() == 2 )
-        Global::setDocument( mw, QString::fromUtf8(argv()[1]) );
+    if ( mw ) {
+       if ( argc() == 2 )
+           Global::setDocument( mw, QString::fromUtf8(argv()[1]) );
 
-
-//    setMainWidget(mw); see above
-    d->show(mw, nomaximize );
+        d->show(mw, nomaximize );
+    }
 }
 
 
 /*!
   If an application is started via a \link qcop.html QCop\endlink
   message, the application will process the \link qcop.html
diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp
index 187adc6..c639002 100644
--- a/noncore/applets/pcmcia/pcmcia.cpp
+++ b/noncore/applets/pcmcia/pcmcia.cpp
@@ -233,12 +233,18 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
                     break;
                 }
             }
             if ( !newCard ) ++it; else break;
         }
     }
+
+    if ( !theCard ) {
+	owarn << "pcmcia: Finished working through cards in PCMCIA system but I do not have a valid card handle" << oendl;
+	return;
+    }
+
     if ( newCard )
     {
         odebug << "pcmcia: unconfigured card detected" << oendl;
         QString newCardName = theCard->productIdentity();
         int result = QMessageBox::information( qApp->desktop(),
                                            tr( "PCMCIA/CF Subsystem" ),
diff --git a/noncore/apps/checkbook/mainwindow.cpp b/noncore/apps/checkbook/mainwindow.cpp
index d9e2047..8e2e2e3 100644
--- a/noncore/apps/checkbook/mainwindow.cpp
+++ b/noncore/apps/checkbook/mainwindow.cpp
@@ -240,12 +240,13 @@ void MainWindow::slotEdit()
 }
 
 
 // --- openBook ---------------------------------------------------------------
 void MainWindow::openBook(QListViewItem *curritem)
 {
+    if ( !curritem ) return;
     // find book in List
     QString currname=curritem->text(posName);
     CBInfo *cb = checkbooks->first();
     while ( cb ) {
         if ( cb->name() == currname )
             break;
@@ -274,16 +275,14 @@ void MainWindow::openBook(QListViewItem *curritem)
     if ( QPEApplication::execDialog( currcb ) == QDialog::Accepted )
     {
         QString newname = cb->name();
         if ( currname != newname )
         {
             // Update name if changed
-            if( curritem ) {
-                curritem->setText( posName, newname );
-                cbList->sort();
-            }
+            curritem->setText( posName, newname );
+            cbList->sort();
             _cfg.setLastBook( newname );
 
             // Remove old file
             QFile f( tempFilename );
             if ( f.exists() )
                 f.remove();
diff --git a/noncore/apps/opie-console/procctl.cpp b/noncore/apps/opie-console/procctl.cpp
index a44529b..5239e26 100644
--- a/noncore/apps/opie-console/procctl.cpp
+++ b/noncore/apps/opie-console/procctl.cpp
@@ -46,13 +46,16 @@ void ProcCtl::remove( pid_t pi ) {
 
     con = m_last;
     ProcContainer* forw = 0l;
     while (con ) {
         /* remove it */
         if ( pi == con->pid ) {
-            forw->prev = con->prev;
+            if (forw)
+		forw->prev = con->prev;
+	    else
+		forw = con->prev;
             delete con;
             return;
         }
 
         forw = con;
         con = con->prev;
diff --git a/noncore/apps/tinykate/libkate/document/katedocument.cpp b/noncore/apps/tinykate/libkate/document/katedocument.cpp
index b82a86a..692fd46 100644
--- a/noncore/apps/tinykate/libkate/document/katedocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katedocument.cpp
@@ -2012,13 +2012,13 @@ void KateDocument::paintTextLine(QPainter &paint, int line, int y, int xStart, i
 {
   TextLine::Ptr textLine;
   int len;
   const QChar *s;
   int z, x;
   QChar ch;
-  Attribute *a = 0L;
+  Attribute *attrptr = 0L;
   int attr, nextAttr;
   int xs;
   int xc, zc;
 
   if (line > lastLine()) {
     paint.fillRect(0, y, xEnd - xStart,fontHeight, colors[0]);
@@ -2037,22 +2037,22 @@ void KateDocument::paintTextLine(QPainter &paint, int line, int y, int xStart, i
     zc = z;
     if (z == len) break;
     ch = s[z];//textLine->getChar(z);
     if (ch == '\t') {
       x += m_tabWidth - (x % m_tabWidth);
     } else {
-     a = &m_attribs[textLine->getAttr(z)];
-
-   if (a->bold && a->italic)
-      x += myFontMetricsBI.width(ch);
-    else if (a->bold)
-      x += myFontMetricsBold.width(ch);
-    else if (a->italic)
-      x += myFontMetricsItalic.width(ch);
-    else
-      x += myFontMetrics.width(ch);
+     attrptr = &m_attribs[textLine->getAttr(z)];
+
+     if (attrptr->bold && attrptr->italic)
+       x += myFontMetricsBI.width(ch);
+     else if (attrptr->bold)
+       x += myFontMetricsBold.width(ch);
+     else if (attrptr->italic)
+       x += myFontMetricsItalic.width(ch);
+     else
+       x += myFontMetrics.width(ch);
     }
     z++;
   } while (x <= xStart);
 
   // draw background
   xs = xStart;
@@ -2076,19 +2076,19 @@ void KateDocument::paintTextLine(QPainter &paint, int line, int y, int xStart, i
     ch = s[z];//textLine->getChar(z);
 
     if (ch == '\t')
       x += m_tabWidth - (x % m_tabWidth);
     else
     {
-      a = &m_attribs[textLine->getAttr(z)];
+      attrptr = &m_attribs[textLine->getAttr(z)];
 
-      if (a->bold && a->italic)
+      if (attrptr->bold && attrptr->italic)
         x += myFontMetricsBI.width(ch);
-      else if (a->bold)
+      else if (attrptr->bold)
         x += myFontMetricsBold.width(ch);
-      else if (a->italic)
+      else if (attrptr->italic)
         x += myFontMetricsItalic.width(ch);
       else
         x += myFontMetrics.width(ch);
     }
     z++;
   }
@@ -2111,44 +2111,42 @@ void KateDocument::paintTextLine(QPainter &paint, int line, int y, int xStart, i
       if (z > zc) {
         //this should cause no copy at all
         QConstString str((QChar *) &s[zc], z - zc /*+1*/);
         QString s = str.string();
         paint.drawText(x - xStart, y, s);
 
-   if (a->bold && a->italic)
-      x += myFontMetricsBI.width(s);
-    else if (a->bold)
-      x += myFontMetricsBold.width(s);
-    else if (a->italic)
-      x += myFontMetricsItalic.width(s);
-    else
-      x += myFontMetrics.width(s);
+        if (attrptr && attrptr->bold && attrptr->italic)
+          x += myFontMetricsBI.width(s);
+        else if (attrptr && attrptr->bold)
+          x += myFontMetricsBold.width(s);
+        else if (attrptr && attrptr->italic)
+          x += myFontMetricsItalic.width(s);
+        else
+          x += myFontMetrics.width(s);
       }
       zc = z +1;
 
       if (showTabs) {
         nextAttr = textLine->getRawAttr(z);
         if (nextAttr != attr) {
           attr = nextAttr;
-          a = &m_attribs[attr & taAttrMask];
-
-          if (attr & taSelected) paint.setPen(a->selCol);
-            else paint.setPen(a->col);
-
-   if (a->bold && a->italic)
-     paint.setFont(myFontBI);
-    else if (a->bold)
-      paint.setFont(myFontBold);
-    else if (a->italic)
-      paint.setFont(myFontItalic);
-    else
-      paint.setFont(myFont);
+          attrptr = &m_attribs[attr & taAttrMask];
+
+          if (attr & taSelected) paint.setPen(attrptr->selCol);
+            else paint.setPen(attrptr->col);
+
+          if (attrptr->bold && attrptr->italic)
+            paint.setFont(myFontBI);
+          else if (attrptr->bold)
+            paint.setFont(myFontBold);
+          else if (attrptr->italic)
+            paint.setFont(myFontItalic);
+          else
+            paint.setFont(myFont);
         }
 
-//        paint.drawLine(x - xStart, y -2, x - xStart, y);
-//        paint.drawLine(x - xStart, y, x - xStart + 2, y);
         paint.drawPoint(x - xStart, y);
         paint.drawPoint(x - xStart +1, y);
         paint.drawPoint(x - xStart, y -1);
       }
       x += m_tabWidth - (x % m_tabWidth);
     } else {
@@ -2156,36 +2154,36 @@ void KateDocument::paintTextLine(QPainter &paint, int line, int y, int xStart, i
       if (nextAttr != attr) {
         if (z > zc) {
           QConstString str((QChar *) &s[zc], z - zc /*+1*/);
           QString s = str.string();
           paint.drawText(x - xStart, y, s);
 
-   if (a->bold && a->italic)
-      x += myFontMetricsBI.width(s);
-    else if (a->bold)
-      x += myFontMetricsBold.width(s);
-    else if (a->italic)
-      x += myFontMetricsItalic.width(s);
-    else
-      x += myFontMetrics.width(s);
+          if (attrptr->bold && attrptr->italic)
+            x += myFontMetricsBI.width(s);
+          else if (attrptr->bold)
+            x += myFontMetricsBold.width(s);
+          else if (attrptr->italic)
+            x += myFontMetricsItalic.width(s);
+          else
+            x += myFontMetrics.width(s);
           zc = z;
         }
         attr = nextAttr;
-        a = &m_attribs[attr & taAttrMask];
-
-        if (attr & taSelected) paint.setPen(a->selCol);
-          else paint.setPen(a->col);
-
-   if (a->bold && a->italic)
-     paint.setFont(myFontBI);
-    else if (a->bold)
-      paint.setFont(myFontBold);
-    else if (a->italic)
-      paint.setFont(myFontItalic);
-    else
-      paint.setFont(myFont);
+        attrptr = &m_attribs[attr & taAttrMask];
+
+        if (attr & taSelected) paint.setPen(attrptr->selCol);
+          else paint.setPen(attrptr->col);
+
+        if (attrptr->bold && attrptr->italic)
+          paint.setFont(myFontBI);
+        else if (attrptr->bold)
+          paint.setFont(myFontBold);
+        else if (attrptr->italic)
+          paint.setFont(myFontItalic);
+        else
+          paint.setFont(myFont);
       }
     }
     z++;
   }
   if (z > zc) {
     QConstString str((QChar *) &s[zc], z - zc /*+1*/);
@@ -2224,13 +2222,15 @@ bool KateDocument::doSearch(SConfig &sc, const QString &searchFor) {
       textLine = getTextLine(line);
       tlen = textLine->length();
       if (tlen > bufLen) {
         delete [] t;
         bufLen = (tlen + 255) & (~255);
         t = new QChar[bufLen];
-      }
+      } else if (!t)
+	  t = new QChar[bufLen];
+
       memcpy(t, textLine->getText(), tlen*sizeof(QChar));
       if (sc.flags & KateView::sfSelected) {
         pos = 0;
         do {
           pos = textLine->findSelected(pos);
           newPos = textLine->findUnselected(pos);
@@ -2285,13 +2285,14 @@ bool KateDocument::doSearch(SConfig &sc, const QString &searchFor) {
       textLine = getTextLine(line);
       tlen = textLine->length();
       if (tlen > bufLen) {
         delete [] t;
         bufLen = (tlen + 255) & (~255);
         t = new QChar[bufLen];
-      }
+      } else if (!t)
+        t = new QChar[bufLen];
       memcpy(t, textLine->getText(), tlen*sizeof(QChar));
       if (sc.flags & KateView::sfSelected) {
         pos = 0;
         do {
           pos = textLine->findSelected(pos);
           newPos = textLine->findUnselected(pos);
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
@@ -262,13 +262,13 @@ void UsbCategory::populate()
             {
                 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
         {
diff --git a/noncore/todayplugins/stockticker/libstocks/http.c b/noncore/todayplugins/stockticker/libstocks/http.c
index 2f38f8a..cc78ab7 100644
--- a/noncore/todayplugins/stockticker/libstocks/http.c
+++ b/noncore/todayplugins/stockticker/libstocks/http.c
@@ -207,13 +207,13 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
   /* and to split headers and content */
   
   temp = data;
   header_founded = 0;
   while( !header_founded )
     {
-      if (*temp==0) return ERRRHEA;
+      if (!temp || *temp==0) return ERRRHEA;
 
       if( *temp==0x0A )
   {
     /* test if it is the header end */
     temp ++;
     if (*temp == 0x0D) temp++;