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, 32 insertions, 31 deletions

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
@@ -2017,3 +2017,3 @@ void KateDocument::paintTextLine(QPainter &paint, int line, int y, int xStart, i
   QChar ch;
-  Attribute *a = 0L;
+  Attribute *attrptr = 0L;
   int attr, nextAttr;
@@ -2042,9 +2042,9 @@ void KateDocument::paintTextLine(QPainter &paint, int line, int y, int xStart, i
     } 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);
@@ -2081,9 +2081,9 @@ void KateDocument::paintTextLine(QPainter &paint, int line, int y, int xStart, i
     {
-      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);
@@ -2116,7 +2116,7 @@ void KateDocument::paintTextLine(QPainter &paint, int line, int y, int xStart, i
 
-   if (a->bold && a->italic)
+        if (attrptr && attrptr->bold && attrptr->italic)
       x += myFontMetricsBI.width(s);
-    else if (a->bold)
+        else if (attrptr && attrptr->bold)
       x += myFontMetricsBold.width(s);
-    else if (a->italic)
+        else if (attrptr && attrptr->italic)
       x += myFontMetricsItalic.width(s);
@@ -2131,12 +2131,12 @@ void KateDocument::paintTextLine(QPainter &paint, int line, int y, int xStart, i
           attr = nextAttr;
-          a = &m_attribs[attr & taAttrMask];
+          attrptr = &m_attribs[attr & taAttrMask];
 
-          if (attr & taSelected) paint.setPen(a->selCol);
-            else paint.setPen(a->col);
+          if (attr & taSelected) paint.setPen(attrptr->selCol);
+            else paint.setPen(attrptr->col);
 
-   if (a->bold && a->italic)
+          if (attrptr->bold && attrptr->italic)
      paint.setFont(myFontBI);
-    else if (a->bold)
+          else if (attrptr->bold)
       paint.setFont(myFontBold);
-    else if (a->italic)
+          else if (attrptr->italic)
       paint.setFont(myFontItalic);
@@ -2146,4 +2146,2 @@ void KateDocument::paintTextLine(QPainter &paint, int line, int y, int xStart, i
 
-//        paint.drawLine(x - xStart, y -2, x - xStart, y);
-//        paint.drawLine(x - xStart, y, x - xStart + 2, y);
         paint.drawPoint(x - xStart, y);
@@ -2161,7 +2159,7 @@ void KateDocument::paintTextLine(QPainter &paint, int line, int y, int xStart, i
 
-   if (a->bold && a->italic)
+          if (attrptr->bold && attrptr->italic)
       x += myFontMetricsBI.width(s);
-    else if (a->bold)
+          else if (attrptr->bold)
       x += myFontMetricsBold.width(s);
-    else if (a->italic)
+          else if (attrptr->italic)
       x += myFontMetricsItalic.width(s);
@@ -2172,12 +2170,12 @@ void KateDocument::paintTextLine(QPainter &paint, int line, int y, int xStart, i
         attr = nextAttr;
-        a = &m_attribs[attr & taAttrMask];
+        attrptr = &m_attribs[attr & taAttrMask];
 
-        if (attr & taSelected) paint.setPen(a->selCol);
-          else paint.setPen(a->col);
+        if (attr & taSelected) paint.setPen(attrptr->selCol);
+          else paint.setPen(attrptr->col);
 
-   if (a->bold && a->italic)
+        if (attrptr->bold && attrptr->italic)
      paint.setFont(myFontBI);
-    else if (a->bold)
+        else if (attrptr->bold)
       paint.setFont(myFontBold);
-    else if (a->italic)
+        else if (attrptr->italic)
       paint.setFont(myFontItalic);
@@ -2229,3 +2227,5 @@ bool KateDocument::doSearch(SConfig &sc, const QString &searchFor) {
         t = new QChar[bufLen];
-      }
+      } else if (!t)
+          t = new QChar[bufLen];
+
       memcpy(t, textLine->getText(), tlen*sizeof(QChar));
@@ -2290,3 +2290,4 @@ bool KateDocument::doSearch(SConfig &sc, const QString &searchFor) {
         t = new QChar[bufLen];
-      }
+      } else if (!t)
+        t = new QChar[bufLen];
       memcpy(t, textLine->getText(), tlen*sizeof(QChar));