Fix crash if bitmapStream is null. Fixes #10390 (#10436)

bgrainger · web-flow · commit 8f7048984a7a · 2025-02-09T08:49:44.000+05:30
This fixes a regression introduced in 3854d32. Cherry-picked from 33d29f7. Conflicts: src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapDecoder.cs
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapDecoder.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapDecoder.cs
@@ -1190,7 +1190,7 @@ out decoder
             }
             catch
             {
-                bitmapStream.Close();
+                bitmapStream?.Close();
                 #pragma warning disable 6500
 
                 decoderHandle = null;

Original file line number	Diff line number	Diff line change
`@@ -1190,7 +1190,7 @@ out decoder`
`1190`	`1190`	`}`
`1191`	`1191`	`catch`
`1192`	`1192`	`{`
`1193`		`- bitmapStream.Close();`
	`1193`	`+ bitmapStream?.Close();`
`1194`	`1194`	`#pragma warning disable 6500`
`1195`	`1195`
`1196`	`1196`	`decoderHandle = null;`