From c3de776c042b4af6109444f40cb43ea282a3eb97 Mon Sep 17 00:00:00 2001
From: Neil Hodgson <nyamatongwe@gmail.com>
Date: Wed, 1 Apr 2015 09:31:20 +1100
Subject: Bug [#1709]. Check whether pixmap is NULL before using to create
 bitmap.

---
 cocoa/ScintillaCocoa.mm   | 3 ++-
 doc/ScintillaHistory.html | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
index 45637b28a..69a8a4c14 100644
--- a/cocoa/ScintillaCocoa.mm
+++ b/cocoa/ScintillaCocoa.mm
@@ -1446,7 +1446,8 @@ void ScintillaCocoa::StartDrag()
   if (pixmap)
   {
     CGImageRef imagePixmap = pixmap->GetImage();
-    bitmap = [[[NSBitmapImageRep alloc] initWithCGImage: imagePixmap] autorelease];
+    if (imagePixmap)
+      bitmap = [[[NSBitmapImageRep alloc] initWithCGImage: imagePixmap] autorelease];
     CGImageRelease(imagePixmap);
     pixmap->Release();
     delete pixmap;
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index e9126ce32..649dc09b2 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -521,6 +521,10 @@
 	<a href="http://sourceforge.net/p/scintilla/bugs/1706/">Bug #1706</a>.
 	</li>
 	<li>
+	Fix potential crash on Cocoa with drag and drop.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1709/">Bug #1709</a>.
+	</li>
+	<li>
 	Fix bug on Windows when compiling with MinGW-w64 which caused text to not be drawn
 	when in wrap mode.
 	<a href="http://sourceforge.net/p/scintilla/bugs/1705/">Bug #1705</a>.
-- 
cgit v1.2.3