github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-20 13:33:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added some NPE protections for BUG-2991

Browse source
This commit is contained in:
Robin Krom 2022-09-03 15:11:16 +02:00
commit 029d47f479
No known key found for this signature in database
GPG key ID: BCC01364F1371490
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Greenshot.Base/Core/ClipboardHelper.cs
View file

@ -386,6 +386,7 @@ EndSelection:<<<<<<<4
/// <returns>IEnumerable{(MemoryStream,string)}</returns> /// <returns>IEnumerable{(MemoryStream,string)}</returns>
private static IEnumerable<(MemoryStream stream,string filename)> IterateClipboardContent(IDataObject dataObject) private static IEnumerable<(MemoryStream stream,string filename)> IterateClipboardContent(IDataObject dataObject)
{ {
if (dataObject == null) yield break;
var fileDescriptors = AvailableFileDescriptors(dataObject); var fileDescriptors = AvailableFileDescriptors(dataObject);
if (fileDescriptors == null) yield break; if (fileDescriptors == null) yield break;
@ -499,6 +500,10 @@ EndSelection:<<<<<<<4
public static Image GetImage() public static Image GetImage()
{ {
IDataObject clipboardData = GetDataObject(); IDataObject clipboardData = GetDataObject();
if (clipboardData == null)
{
return null;
}
// Return the first image // Return the first image
foreach (var clipboardImage in GetImages(clipboardData)) foreach (var clipboardImage in GetImages(clipboardData))
{ {