From 8e7274be250aa1b92f9d7b11fa3ae27dec7e2a2f Mon Sep 17 00:00:00 2001 From: Neil Hodgson Date: Tue, 15 May 2018 19:20:22 +1000 Subject: Backport: Fix crashes for invalid DBCS characters when dragging text, changing case of text, case-insensitive searching, and retrieving text as UTF-8. Backport of changeset 6952:7bfe9ec5222a. --- cocoa/ScintillaCocoa.mm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'cocoa') diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm index 74113a364..2bd252e70 100644 --- a/cocoa/ScintillaCocoa.mm +++ b/cocoa/ScintillaCocoa.mm @@ -656,6 +656,9 @@ std::string ScintillaCocoa::CaseMapString(const std::string &s, int caseMapping) vs.styles[STYLE_DEFAULT].characterSet); CFStringRef cfsVal = CFStringFromString(s.c_str(), s.length(), encoding); + if (!cfsVal) { + return s; + } NSString *sMapped; switch (caseMapping) @@ -1301,6 +1304,8 @@ void ScintillaCocoa::DragScroll() selectedText.characterSet); CFStringRef cfsVal = CFStringFromString(selectedText.Data(), selectedText.Length(), encoding); + if (!cfsVal) + return; if ([type compare: NSPasteboardTypeString] == NSOrderedSame) { @@ -1584,6 +1589,8 @@ void ScintillaCocoa::SetPasteboardData(NSPasteboard* board, const SelectionText selectedText.characterSet); CFStringRef cfsVal = CFStringFromString(selectedText.Data(), selectedText.Length(), encoding); + if (!cfsVal) + return; NSArray *pbTypes = selectedText.rectangular ? [NSArray arrayWithObjects: NSStringPboardType, ScintillaRecPboardType, nil] : @@ -1663,6 +1670,9 @@ Sci::Position ScintillaCocoa::TargetAsUTF8(char *text) const vs.styles[STYLE_DEFAULT].characterSet); const std::string s = RangeText(targetStart, targetEnd); CFStringRef cfsVal = CFStringFromString(s.c_str(), s.length(), encoding); + if (!cfsVal) { + return 0; + } const std::string tmputf = EncodedBytesString(cfsVal, kCFStringEncodingUTF8); -- cgit v1.2.3