-
Notifications
You must be signed in to change notification settings - Fork 4.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix CA2022 warnings (Avoid inexact read with 'Stream.Read') #100352
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
53cdd1d
Configure CA2022 severity
mpidash d9ea36a
Fix CA2022 warnings
mpidash ba7d12c
Check for NET7_0_OR_GREATER before using ReadExactly
mpidash 8cf6b19
Merge branch 'main' into ca2022
stephentoub b94df00
Fix CS1503
mpidash 79f13ef
Formatting
mpidash 7e1ed89
Merge branch 'main' into ca2022
buyaa-n File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 file contains 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 file contains 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 file contains 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 file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -121,7 +121,22 @@ internal void PlayWaveFile(AudioData audio) | |
try | ||
{ | ||
byte[] data = new byte[(int)audio._stream.Length]; | ||
audio._stream.Read(data, 0, data.Length); | ||
|
||
#if NET7_0_OR_GREATER | ||
audio._stream.ReadExactly(data); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. And here |
||
#else | ||
int totalRead = 0; | ||
while (totalRead < data.Length) | ||
{ | ||
int bytesRead = audio._stream.Read(data, totalRead, data.Length - totalRead); | ||
if (bytesRead <= 0) | ||
{ | ||
throw new EndOfStreamException(); | ||
} | ||
totalRead += bytesRead; | ||
} | ||
#endif | ||
|
||
Play(data); | ||
} | ||
finally | ||
|
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -174,7 +174,22 @@ public Stream LoadResource(Uri uri, string mediaType) | |
int cLen = (int)stream.Length; | ||
MemoryStream memStream = new(cLen); | ||
byte[] ab = new byte[cLen]; | ||
stream.Read(ab, 0, ab.Length); | ||
|
||
#if NET7_0_OR_GREATER | ||
stream.ReadExactly(ab); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Basically all of them :) |
||
#else | ||
int totalRead = 0; | ||
while (totalRead < cLen) | ||
{ | ||
int bytesRead = stream.Read(ab, totalRead, cLen - totalRead); | ||
if (bytesRead <= 0) | ||
{ | ||
throw new EndOfStreamException(); | ||
} | ||
totalRead += bytesRead; | ||
} | ||
#endif | ||
|
||
_resourceLoader.UnloadFile(localPath); | ||
memStream.Write(ab, 0, cLen); | ||
memStream.Position = 0; | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same here