From 029d47f479abadf5382daddc456790ad43a2e798 Mon Sep 17 00:00:00 2001 From: Robin Krom Date: Sat, 3 Sep 2022 15:11:16 +0200 Subject: [PATCH] Added some NPE protections for BUG-2991 --- src/Greenshot.Base/Core/ClipboardHelper.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Greenshot.Base/Core/ClipboardHelper.cs b/src/Greenshot.Base/Core/ClipboardHelper.cs index ed9f2c3e9..bfe13c121 100644 --- a/src/Greenshot.Base/Core/ClipboardHelper.cs +++ b/src/Greenshot.Base/Core/ClipboardHelper.cs @@ -386,6 +386,7 @@ EndSelection:<<<<<<<4 /// IEnumerable{(MemoryStream,string)} private static IEnumerable<(MemoryStream stream,string filename)> IterateClipboardContent(IDataObject dataObject) { + if (dataObject == null) yield break; var fileDescriptors = AvailableFileDescriptors(dataObject); if (fileDescriptors == null) yield break; @@ -499,6 +500,10 @@ EndSelection:<<<<<<<4 public static Image GetImage() { IDataObject clipboardData = GetDataObject(); + if (clipboardData == null) + { + return null; + } // Return the first image foreach (var clipboardImage in GetImages(clipboardData)) {