diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2015-04-01 09:31:20 +1100 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2015-04-01 09:31:20 +1100 |
| commit | c3de776c042b4af6109444f40cb43ea282a3eb97 (patch) | |
| tree | 85cba06c14de14d363ce1291f30d356cf5dc069a | |
| parent | 1aaf56f5d94c609ac2ecfbb395937b49ac5929d7 (diff) | |
| download | scintilla-mirror-c3de776c042b4af6109444f40cb43ea282a3eb97.tar.gz | |
Bug [#1709]. Check whether pixmap is NULL before using to create bitmap.
| -rw-r--r-- | cocoa/ScintillaCocoa.mm | 3 | ||||
| -rw-r--r-- | doc/ScintillaHistory.html | 4 |
2 files changed, 6 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; 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>. |