Fix crash if bitmapStream is null #10428
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes a regression introduced in 3854d32.
dotnet-policy-service
bot
requested review from
dipeshmsft,
singhashish-wpf and
Kuldeep-MS
dotnet-policy-service
bot
added
PR
singhashish-wpf
approved these changes
Feb 8, 2025
|
/backport to release/9.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/wpf/actions/runs/13212067344 |
|
@singhashish-wpf backporting to "release/9.0" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fix crash if bitmapStream is null. Fixes #10390
Using index info to reconstruct a base tree...
M src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapDecoder.cs
Falling back to patching base and 3-way merge...
Auto-merging src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapDecoder.cs
CONFLICT (content): Merge conflict in src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/BitmapDecoder.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Fix crash if bitmapStream is null. Fixes #10390
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
Backport PR: #10436 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #10390.
Description
bitmapStreammay benullinSetupDecoderFromUriOrStream; this fixes aNullReferenceExceptionclosing it if an exception occurs.Customer Impact
Potential
NullReferenceExceptionfromBitmapImagewhen loading invalid image data.Regression
This fixes a regression introduced in .NET 9.0 in 3854d32.
Testing
None.
Risk
Low. This allows a local variable to be
nulland takes no action if it is.Microsoft Reviewers: Open in CodeFlow