aboutsummaryrefslogtreecommitdiffhomepage
path: root/cocoa
diff options
context:
space:
mode:
authorNeil Hodgson <nyamatongwe@gmail.com>2015-04-01 09:31:20 +1100
committerNeil Hodgson <nyamatongwe@gmail.com>2015-04-01 09:31:20 +1100
commitc3de776c042b4af6109444f40cb43ea282a3eb97 (patch)
tree85cba06c14de14d363ce1291f30d356cf5dc069a /cocoa
parent1aaf56f5d94c609ac2ecfbb395937b49ac5929d7 (diff)
downloadscintilla-mirror-c3de776c042b4af6109444f40cb43ea282a3eb97.tar.gz
Bug [#1709]. Check whether pixmap is NULL before using to create bitmap.
Diffstat (limited to 'cocoa')
-rw-r--r--cocoa/ScintillaCocoa.mm3
1 files changed, 2 insertions, 1 deletions
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;