github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ensure temporary std::string stays in scope when using its data

Browse Source
This commit is contained in:
Allan Odgaard
2019-07-13 11:02:25 +02:00
parent 027038aaed
commit 066e020265
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Frameworks/OakTextView/src/OakTextView.mm
View File

@@ -1218,10 +1218,10 @@ doScroll:
// similar to basic_tree_t for conversion between UTF-8 and UTF-16 indexes.
// Currently poor performance for large documents (O(N)) would then get to O(log(N))
// Also currently copy of whole text is created here, which is not optimal
std::string const text = documentView->substr(0, range.max().index);
char const* base = text.data();
NSUInteger location = utf16::distance(base, base + range.min().index);
NSUInteger length = utf16::distance(base + range.min().index, base + range.max().index);
size_t from = range.min().index, to = range.max().index;
std::string const text = documentView->substr(0, to);
NSUInteger location = utf16::distance(text.data(), text.data() + from);
NSUInteger length = utf16::distance(text.data() + from, text.data() + to);
return NSMakeRange(location, length);
}