aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbhishek Kishore2014-01-27 05:51:25 (EST)
committerGerrit Code Review @ Eclipse.org2014-01-30 02:11:34 (EST)
commitf0fa0a25ac6c000c51452318d89851e43dc7c7d5 (patch)
tree824b63a286c478de29bedc6314d22f2cec4397de
parentd0183d07022512013793003950f574ca2b1fc61f (diff)
downloadeclipse.platform.swt-f0fa0a25ac6c000c51452318d89851e43dc7c7d5.zip
eclipse.platform.swt-f0fa0a25ac6c000c51452318d89851e43dc7c7d5.tar.gz
eclipse.platform.swt-f0fa0a25ac6c000c51452318d89851e43dc7c7d5.tar.bz2
Bug 426522 - Application freeze in Mac SWT due to null pointer.refs/changes/28/21128/3
Change-Id: Ic888ca54487b738f4983186f002dce204e7a50da Signed-off-by: Abhishek Kishore <abhishek.kishore@in.ibm.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TableDragSourceEffect.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TableDragSourceEffect.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TableDragSourceEffect.java
index 6b5f234..8138c37 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TableDragSourceEffect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/TableDragSourceEffect.java
@@ -86,6 +86,7 @@ public class TableDragSourceEffect extends DragSourceEffect {
NSImage nsImage = widget.dragImageForRowsWithIndexes(widget.selectedRowIndexes(), widget.tableColumns(), nsEvent, ptr);
OS.memmove(point, ptr, NSPoint.sizeof);
OS.free(ptr);
+ if (nsImage == null) return null;
//TODO: Image representation wrong???
Image image = Image.cocoa_new(control.getDisplay(), SWT.BITMAP, nsImage);
dragSourceImage = image;