Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-07-23 03:02:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix a couple of bugs related with use-after-free. Try to make some of the text document and syntax highlighter functionality more thread-safe.

Browse Source
This commit is contained in:
Martín Lucas Golini
2025-08-10 01:25:10 -03:00
parent 61c3e72289
commit cec73de2eb
26 changed files with 469 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/ecode/projectsearch.cpp
View File

@@ -74,7 +74,7 @@ searchInFileHorspool( const std::string& file, const std::string& text, const bo
totNl += countNewLines( fileText, lSearchRes, searchRes );
String str(
textLine( caseSensitive ? fileText : fileTextOriginal, searchRes, relCol ) );
res.push_back( { str,
res.push_back( { std::move( str ),
{ { (Int64)totNl, (Int64)relCol },
{ (Int64)totNl, (Int64)( relCol + String::utf8Length( text ) ) } },
searchRes,
@@ -168,11 +168,11 @@ ProjectSearch::fileResFromDoc( const std::string& string, bool caseSensitive, bo
for ( const auto& r : res ) {
ProjectSearch::ResultData::Result f;
f.position = r.result;
const auto& line = doc->line( r.result.start().line() );
if ( line.size() > EE_1KB )
f.line = line.substr( 0, EE_1KB );
auto lineLen = doc->getLineLength( r.result.start().line() );
if ( lineLen > EE_1KB )
f.line = doc->getLineTextSubStr( r.result.start().line(), 0, EE_1KB );
else
f.line = line.getTextWithoutNewLine();
f.line = doc->getLineTextWithoutNewLine( r.result.start().line() );
f.start = r.result.start().column();
f.end = r.result.end().column();
std::vector<std::string> captures;