6 files changed, 77 insertions, 68 deletions

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
@@ -227,24 +227,30 @@ void PcmciaManager::cardMessage( const QCString & msg, const QByteArray & )
                 odebug << "pcmcia: comparing card '" << cardName << "' with known card '" << name << "'" << oendl;
                 if ( cardName == name )
                 {
                     newCard = false;
                     odebug << "pcmcia: we have seen this card before" << oendl;
                     executeAction( theCard, "insert" );
                     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" ),
                                            tr( "<qt>You have inserted the card<br/><b>%1</b><br/>This card is not yet configured. Do you want to configure it now?</qt>" ).arg( newCardName ),
                                            tr( "Yes" ), tr( "No" ), 0, 0, 1 );
         odebug << "pcmcia: result = " << result << oendl;
         if ( result == 0 )
         {
             configure( theCard );
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
@@ -234,24 +234,25 @@ void MainWindow::slotEdit()
 {
     // get name and open it
     QListViewItem *curritem = cbList->currentItem();
     if ( !curritem )
         return;
     openBook( curritem );
 }
 
 
 // --- 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;
         cb = checkbooks->next();
     }
     if ( !cb ) return;
 
     //
     buildFilename( currname );
@@ -268,28 +269,26 @@ void MainWindow::openBook(QListViewItem *curritem)
         }
         delete pw;
     }
 
     _cfg.setLastBook( currname );
     Checkbook *currcb = new Checkbook( this, cb, &_cfg );
     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();
 
             // Get new filename
             buildFilename( newname );
             cb->setFilename( tempFilename );
         }
 
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
@@ -40,25 +40,28 @@ void ProcCtl::remove( pid_t pi ) {
     if (m_last->pid == pi ) {
         con = m_last;
         m_last = con->prev;
         delete con;
         return;
     }
 
     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;
     }
 
 }
 void ProcCtl::remove( ProcContainer con ) {
     remove( con.pid );
 }
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
@@ -2006,59 +2006,59 @@ QColor &KateDocument::cursorCol(int x, int y) {
 void KateDocument::paintTextLine(QPainter &paint, int line, int xStart, int xEnd, bool showTabs)
 {
   paintTextLine (paint, line, 0, xStart, xEnd, showTabs);
 }
 
 void KateDocument::paintTextLine(QPainter &paint, int line, int y, int xStart, int xEnd, bool showTabs)
 {
   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]);
     return;
   }
 
   textLine = getTextLine(line);
   len = textLine->length();
   s = textLine->getText();
 
   // skip to first visible character
   x = 0;
   z = 0;
   do {
     xc = x;
     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;
   attr = textLine->getRawAttr(zc);
   while (x < xEnd)
   {
     nextAttr = textLine->getRawAttr(z);
     if ((nextAttr ^ attr) & taSelected)
     {
@@ -2070,31 +2070,31 @@ void KateDocument::paintTextLine(QPainter &paint, int line, int y, int xStart, i
       xs = x;
       attr = nextAttr;
     }
 
     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)];
+      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++;
   }
 
   if (attr & taSelected)
     paint.fillRect(xs - xStart, y, xEnd - xs, fontHeight, colors[1]);
   else
     paint.fillRect(xs - xStart, y, xEnd - xs, fontHeight, colors[0]);
 
@@ -2105,93 +2105,91 @@ void KateDocument::paintTextLine(QPainter &paint, int line, int y, int xStart, i
   z = zc;
   y += fontAscent;// -1;
   attr = -1;
   while (z < len) {
     ch = s[z];//textLine->getChar(z);
     if (ch == '\t') {
       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 {
       nextAttr = textLine->getRawAttr(z);
       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*/);
     paint.drawText(x - xStart, y, str.string());
   }
 }
 
 // Applies the search context, and returns whether a match was found. If one is,
 // the length of the string matched is also returned.
@@ -2218,25 +2216,27 @@ bool KateDocument::doSearch(SConfig &sc, const QString &searchFor) {
         col = 0;
       }
       searchEnd = selectEnd;
     } else searchEnd = lastLine();
 
     while (line <= searchEnd) {
       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);
           memset(&t[pos], 0, (newPos - pos)*sizeof(QChar));
           pos = newPos;
         } while (pos < tlen);
       }
 
       QString text(t, tlen);
@@ -2279,25 +2279,26 @@ bool KateDocument::doSearch(SConfig &sc, const QString &searchFor) {
         col = -1;
       }
       searchEnd = selectStart;
     } else searchEnd = 0;
 
     while (line >= searchEnd) {
       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);
           memset(&t[pos], 0, (newPos - pos)*sizeof(QChar));
           pos = newPos;
         } while (pos < tlen);
       }
 
       if (col < 0 || col > tlen) col = tlen;
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
@@ -256,25 +256,25 @@ void UsbCategory::populate()
             {
                 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;
         }
     }
 }
 
 
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
@@ -201,25 +201,25 @@ libstocks_return_code http_get(char *http_file, char *http_server, char **pdata)
 
 #ifdef DEBUG
   printf("%s\n", data);
 #endif
 
   /* get headers to test status line */
   /* 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++;
     if (*temp == 0x0A) header_founded = 1;
   }
       else
   temp++;
     }