From 9268cc1adb113f01972b521ed2a0c11757a7c66a Mon Sep 17 00:00:00 2001
From: nyamatongwe <nyamatongwe@gmail.com>
Date: Mon, 9 Apr 2012 19:49:22 +1000
Subject: Protect against NULLs when text is not valid in encoding.

---
 cocoa/ScintillaCocoa.mm | 8 +++++---
 1 file 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);
 }
 
 //--------------------------------------------------------------------------------------------------
-- 
cgit v1.2.3