Skip to content

[release/7.0-rc2] Handle a null szPname field #75716

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.

Sign up for GitHub

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

Merged
carlossanlop merged 5 commits into from
Sep 16, 2022
Merged

[release/7.0-rc2] Handle a null szPname field #75716

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
643f3c4
Handle a null szPname field
jkoritzinsky Sep 15, 2022
a8072de
Always clear the span to ensure we have a null terminator in case the…
jkoritzinsky Sep 15, 2022
26edf0e
Use null conditional access
jkoritzinsky Sep 15, 2022
12c56e3
Add call to test to test scenario
jkoritzinsky Sep 15, 2022
deb3ffb
Update src/libraries/System.Speech/tests/SynthesizeRecognizeTests.cs
jkoritzinsky Sep 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use null conditional access
  • Loading branch information
@jkoritzinsky
jkoritzinsky authored and github-actions committed Sep 15, 2022
commit 26edf0e5e06a3fec9946176ce81770827511e44f
5 changes: 1 addition & 4 deletions src/libraries/Common/src/Interop/Windows/WinMm/Interop.waveOutGetDevCaps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,7 @@ public Native(WAVEOUTCAPS managed)
vDriverVersion = managed.vDriverVersion;
Span<char> szPnameSpan = MemoryMarshal.CreateSpan(ref szPname[0], szPnameLength);
szPnameSpan.Clear();
if (managed.szPname is not null)
{
managed.szPname.CopyTo(szPnameSpan);
}
managed.szPname?.CopyTo(szPnameSpan);
dwFormats = managed.dwFormats;
wChannels = managed.wChannels;
wReserved1 = managed.wReserved1;
Expand Down