Require a non-empty drag image to prevent crash

diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc
index 0d52112..a8f864c 100644 (file)
--- a/atom/browser/api/atom_api_web_contents.cc
+++ b/atom/browser/api/atom_api_web_contents.cc
@@ -1327,9 +1327,17 @@ void WebContents::StartDrag(const mate::Dictionary& item,
 
   // Error checking.
   if (icon.IsEmpty()) {
+    args->ThrowError("Must specify 'icon' option");
+    return;
+  }
+
+#if defined(OS_MACOSX)
+  // NSWindow.dragImage requires a non-empty NSImage
+  if (icon->image().IsEmpty()) {
     args->ThrowError("Must specify non-empty 'icon' option");
     return;
   }
+#endif
 
   // Start dragging.
   if (!files.empty()) {

diff --git a/spec/api-web-contents-spec.js b/spec/api-web-contents-spec.js
index 417b8d5..98aa116 100644 (file)
--- a/spec/api-web-contents-spec.js
+++ b/spec/api-web-contents-spec.js
@@ -293,12 +293,14 @@ describe('webContents module', function () {
       }, /Must specify either 'file' or 'files' option/)
 
       assert.throws(() => {
-        w.webContents.startDrag({file: __filename, icon: __filename})
-      }, /Must specify non-empty 'icon' option/)
-
-      assert.throws(() => {
         w.webContents.startDrag({file: __filename})
-      }, /Must specify non-empty 'icon' option/)
+      }, /Must specify 'icon' option/)
+
+      if (process.platform === 'darwin') {
+        assert.throws(() => {
+          w.webContents.startDrag({file: __filename, icon: __filename})
+        }, /Must specify non-empty 'icon' option/)
+      }
     })
   })
 })