aboutsummaryrefslogtreecommitdiffhomepage
path: root/cocoa
diff options
context:
space:
mode:
authornyamatongwe <nyamatongwe@gmail.com>2013-06-05 14:20:47 +1000
committernyamatongwe <nyamatongwe@gmail.com>2013-06-05 14:20:47 +1000
commitfb2c65fb27d115e562a23aa8fd6fa4fe5b256800 (patch)
tree5064dad8e9a4040fbe8c150723776284be2d3bb7 /cocoa
parente2517c182a4f5c3ddc6d1398903df0049265b388 (diff)
downloadscintilla-mirror-fb2c65fb27d115e562a23aa8fd6fa4fe5b256800.tar.gz
Avoid crash when byte value does not represent a character in current encoding.
Diffstat (limited to 'cocoa')
-rw-r--r--cocoa/ScintillaCocoa.mm2
1 files changed, 2 insertions, 0 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index b8c948dda..910cd344a 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -606,6 +606,8 @@ CaseFolder *ScintillaCocoa::CaseFolderForEncoding() {
CFStringRef cfsVal = CFStringCreateWithBytes(kCFAllocatorDefault,
reinterpret_cast<const UInt8 *>(sCharacter),
1, encoding, false);
+ if (!cfsVal)
+ continue;
NSString *sMapped = [(NSString *)cfsVal stringByFoldingWithOptions:NSCaseInsensitiveSearch
locale:[NSLocale currentLocale]];