Refs edbee#35, fixed some coverity scan issues

Mudlet · Jun 28, 2017 · 672e1a7 · 672e1a7
1 parent 9328ca5
commit 672e1a7
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,3 +31,6 @@ cmake_install.cmake
 install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
+cov-int
+
+edbee-test/edbee-test
diff --git a/edbee-lib/edbee/io/jsonparser.cpp b/edbee-lib/edbee/io/jsonparser.cpp
@@ -63,6 +63,7 @@ bool JsonParser::parse( QIODevice* device )
             errorMessage_ = device->errorString();
             return false;
         }
+        opened = true;
     }
 
     QByteArray bytesIn = device->readAll();

diff --git a/edbee-lib/edbee/models/changes/linedatalistchange.cpp b/edbee-lib/edbee/models/changes/linedatalistchange.cpp
@@ -89,6 +89,8 @@ void LineDataListChange::revert(TextDocument* doc)
 void LineDataListChange::mergeStoredData(AbstractRangedChange* change)
 {
     LineDataListChange* lineTextChange = dynamic_cast<LineDataListChange*>(change);
+    Q_ASSERT(lineTextChange );  // this shouldn't happen
+    if( !lineTextChange ) return;
 
     // calculate the new size
     int newOldListSize = getMergedStoredLength( change);// qlog_info() << "CALCULATED: " << newOldListSize ;

diff --git a/edbee-lib/edbee/models/changes/mergablechangegroup.cpp b/edbee-lib/edbee/models/changes/mergablechangegroup.cpp
@@ -397,8 +397,10 @@ QString MergableChangeGroup::toSingleTextChangeTestString()
     QString result;
     foreach( AbstractRangedChange* abstractChange, textChangeList_ ) {
         TextChange* change = dynamic_cast<TextChange*>(abstractChange);
-        if( !result.isEmpty() ) result.append(",");
-        result.append( QString("%1:%2:%3").arg(change->offset()).arg(change->docLength()).arg(change->storedText()) );
+        if( change ) {
+            if( !result.isEmpty() ) result.append(",");
+            result.append( QString("%1:%2:%3").arg(change->offset()).arg(change->docLength()).arg(change->storedText()) );
+        }
     }
     return result;
 }

diff --git a/edbee-lib/edbee/util/mem/debug_new.cpp b/edbee-lib/edbee/util/mem/debug_new.cpp
@@ -102,7 +102,7 @@ void* operator new[] (size_t size, const char* file, const int line)
 /// the delete array operator
 void operator delete[] (void* p, const char* file, const int line)
 {
-    delete[] p;
+//    delete[] p;  << This is strange!!
     return debug_free(p, file, line);
 }
 

diff --git a/edbee-lib/edbee/util/regexp.cpp b/edbee-lib/edbee/util/regexp.cpp
@@ -85,6 +85,7 @@ class OnigRegExpEngine : public RegExpEngine
         : reg_(0)
         , region_(0)
         , pattern_(pattern)
+        , lineRef_(0)
     {
         const QChar* patternChars = pattern.constData();
 
@@ -389,11 +390,14 @@ RegExp::RegExp( const QString& pattern, bool caseSensitive, Syntax syntax, Engin
         case EngineQRegExp:
             d_ = new QtRegExpEngine(pattern, caseSensitive, syntax);
             break;
+        case EngineOniguruma:
+            d_ = new OnigRegExpEngine(pattern, caseSensitive, syntax);
+            break;
         default:
             Q_ASSERT(false);
             qlog_warn() << "Invalid engine supplied to RegExp. Falling back to EngineOniguruma";
-        case EngineOniguruma:
             d_ = new OnigRegExpEngine(pattern, caseSensitive, syntax);
+            break;
     }
 }
 

diff --git a/edbee-lib/edbee/util/simpleprofiler.cpp b/edbee-lib/edbee/util/simpleprofiler.cpp
@@ -102,9 +102,9 @@ void SimpleProfiler::dumpResults()
         }
 
         foreach( ProfilerItem* item, items ) {
-            double durationPercentage = 100.0 * item->duration() / totalDuration;
-            double callCountPercentage = 100.0 * item->callCount() / totalCallCount;
-            double durationWithoutChildsPercenage = 100.0 * item->durationWithoutChilds() / totalDurationWitoutChilds;
+            double durationPercentage = totalDuration > 0 ? 100.0 * item->duration() / totalDuration : 100;
+            double callCountPercentage = totalCallCount > 0 ? 100.0 * item->callCount() / totalCallCount : 100;
+            double durationWithoutChildsPercenage = totalDurationWitoutChilds > 0 ? 100.0 * item->durationWithoutChilds() / totalDurationWitoutChilds : 100;
 
             QString line = QString("%1x(%2%) %3ms(%4%) %5ms(%6%) |  %7:%8 %9")
                .arg(item->callCount(),8).arg( callCountPercentage, 6, 'f', 2 )

diff --git a/edbee-lib/edbee/views/components/texteditorrenderer.cpp b/edbee-lib/edbee/views/components/texteditorrenderer.cpp
@@ -26,6 +26,7 @@ static const int ShadowWidth=5;
 
 TextEditorRenderer::TextEditorRenderer( TextRenderer *renderer )
     : rendererRef_(renderer)
+    , themeRef_(0)
     , shadowGradient_(0)
 {
     shadowGradient_ = new QLinearGradient( 0, 0, ShadowWidth, 0 );

diff --git a/edbee-lib/edbee/views/textrenderer.cpp b/edbee-lib/edbee/views/textrenderer.cpp
@@ -38,6 +38,10 @@ TextRenderer::TextRenderer(TextEditorController* controller)
     , totalWidthCache_(0)
     , textThemeStyler_(0)
     , clipRectRef_(0)
+    , startOffset_(0)
+    , endOffset_(0)
+    , startLine_(0)
+    , endLine_(0)
 {
     connect( controller, SIGNAL(textDocumentChanged(edbee::TextDocument*,edbee::TextDocument*)), this, SLOT(textDocumentChanged(edbee::TextDocument*,edbee::TextDocument*)));
     textThemeStyler_ = new TextThemeStyler( controller );