aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--cocoa/ScintillaCocoa.mm8
1 files changed, 5 insertions, 3 deletions
diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index e7beda69b..68590798b 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -307,13 +307,14 @@ public:
locale:[NSLocale currentLocale]];
const char *cpMapped = [sMapped UTF8String];
- size_t lenMapped = strlen(cpMapped);
+ size_t lenMapped = cpMapped ? strlen(cpMapped) : 0;
if (lenMapped < sizeFolded) {
memcpy(folded, cpMapped, lenMapped);
} else {
lenMapped = 0;
}
- CFRelease(cfsVal);
+ if (cfsVal)
+ CFRelease(cfsVal);
return lenMapped;
}
}
@@ -1167,7 +1168,8 @@ void ScintillaCocoa::SetPasteboardData(NSPasteboard* board, const SelectionText
[board setString: (NSString *)cfsVal forType: NSStringPboardType];
- CFRelease(cfsVal);
+ if (cfsVal)
+ CFRelease(cfsVal);
}
//--------------------------------------------------------------------------------------------------