[ci release] Fix crash on last line

variar · May 19, 2021 · b39641f · b39641f
1 parent 7fddde5
commit b39641f
Show file tree

Hide file tree

Showing 4 changed files with 134 additions and 84 deletions.
diff --git a/src/logdata/include/data/logdata.h b/src/logdata/include/data/logdata.h
@@ -71,11 +71,11 @@ class LogData : public AbstractLogData {
     LogData();
     ~LogData();
 
-    LogData(const LogData&) = delete;
-    LogData& operator=(const LogData&&) = delete;
+    LogData( const LogData& ) = delete;
+    LogData& operator=( const LogData&& ) = delete;
 
-    LogData(LogData&&) = delete;
-    LogData& operator=(LogData&&) = delete;
+    LogData( LogData&& ) = delete;
+    LogData& operator=( LogData&& ) = delete;
 
     // Attaches the LogData to a file on disk
     // It starts the asynchronous indexing and returns (almost) immediately
@@ -100,24 +100,24 @@ class LogData : public AbstractLogData {
     // Get the auto-detected encoding for the indexed text.
     QTextCodec* getDetectedEncoding() const;
 
-    struct RawLines
-    {
-      LineNumber startLine;
-      LinesCount numberOfLines;
+    struct RawLines {
+        LineNumber startLine;
+        LinesCount numberOfLines;
 
-      std::vector<char> buffer;
-      std::vector<qint64> endOfLines;
+        std::vector<char> buffer;
+        std::vector<qint64> endOfLines;
 
-      TextDecoder textDecoder;
+        TextDecoder textDecoder;
 
-      std::vector<QString> decodeLines() const;
-      std::vector<std::string_view> transformToUtf8() const;
+      public:
+        std::vector<QString> decodeLines() const;
+        std::vector<std::string_view> buildUtf8View() const;
 
       private:
-      mutable QByteArray utf8Data_;
+        mutable QByteArray utf8Data_;
     };
 
-    RawLines getLinesRaw(LineNumber first, LinesCount number) const;
+    RawLines getLinesRaw( LineNumber first, LinesCount number ) const;
 
   signals:
     // Sent during the 'attach' process to signal progress
@@ -156,7 +156,7 @@ class LogData : public AbstractLogData {
     std::vector<QString> getLinesFromFile( LineNumber first, LinesCount number,
                                            QString ( *processLine )( QString&& ) ) const;
 
-private:
+  private:
     mutable std::unique_ptr<FileHolder> attached_file_;
 
     // Indexing data, read by us, written by the worker thread

diff --git a/src/logdata/src/logdata.cpp b/src/logdata/src/logdata.cpp
@@ -479,7 +479,7 @@ std::vector<QString> LogData::RawLines::decodeLines() const
     return decodedLines;
 }
 
-std::vector<std::string_view> LogData::RawLines::transformToUtf8() const
+std::vector<std::string_view> LogData::RawLines::buildUtf8View() const
 {
     std::vector<std::string_view> lines;
     lines.reserve( numberOfLines.get() );
@@ -493,11 +493,15 @@ std::vector<std::string_view> LogData::RawLines::transformToUtf8() const
 
         auto nextLineFeed = wholeString.find( '\n' );
         while ( nextLineFeed != std::string_view::npos ) {
-            lines.emplace_back( wholeString.data(), nextLineFeed );
+            lines.push_back( wholeString.substr( 0, nextLineFeed ) );
             wholeString.remove_prefix( nextLineFeed + 1 );
             nextLineFeed = wholeString.find( '\n' );
         }
 
+        if ( !wholeString.empty() ) {
+            lines.push_back( wholeString );
+        }
+
     } catch ( const std::exception& e ) {
         LOG_ERROR << "failed to transform lines to utf8 " << e.what();
         const auto lastLineOffset = utf8Data_.size();

diff --git a/src/logdata/src/logfiltereddataworker.cpp b/src/logdata/src/logfiltereddataworker.cpp
@@ -96,17 +96,17 @@ PartialSearchResults filterLines( const MatcherVariant& matcher, const LogData::
     results.chunkStart = chunkStart;
     results.processedLines = rawLines.numberOfLines;
 
-    const auto& lines = rawLines.transformToUtf8();
+    const auto& lines = rawLines.buildUtf8View();
 
-    for ( auto offset = 0_lcount; offset < results.processedLines; ++offset ) {
-        const auto& line = lines[ offset.get() ];
+    for ( auto offset = 0u; offset < lines.size(); ++offset ) {
+        const auto& line = lines[ offset ];
 
         const auto hasMatch
             = std::visit( [ &line ]( const auto& m ) { return m.hasMatch( line ); }, matcher );
 
         if ( hasMatch ) {
             results.maxLength = qMax( results.maxLength, getUntabifiedLength( line ) );
-            const auto lineNumber = chunkStart + offset;
+            const auto lineNumber = chunkStart + LinesCount{offset};
             results.matchingLines.add( lineNumber.get() );
 
             // LOG_INFO << "Match at " << lineNumber << ": " << line;