Eliminate two memory leaks #16597
Merged
Eliminate two memory leaks #16597
Conversation
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
lhecker
approved these changes
Jan 24, 2024
| return winrt::to_hstring(returnVal); | ||
| wil::unique_bstr returnVal; | ||
| THROW_IF_FAILED(_uiaProvider->GetText(maxLength, returnVal.put())); | ||
| return winrt::to_hstring(returnVal.get()); |
There was a problem hiding this comment.
We could choose to use return winrt::hstring{ returnVal.get(), SysStringLen(returnVal.get()) } here to avoid the need for the wcslen call.
DHowett
approved these changes
Jan 24, 2024
In WindowsTerminal, there was a leak of a BSTR with every call to ITextRangeProvider::GetText, and a failure to call VariantClear in ITextRange::GetAttributeValue when the value stored in the variant is VT_BSTR. These were fixed by switching to wil::unique_bstr and wil::unique_variant.
glenrgordon
force-pushed
the
uia-memory-leak
branch
from
301bb35
to
d2950aa
Compare
lhecker
approved these changes
Jan 25, 2024
lhecker
added
Issue-Bug
microsoft-github-policy-service
bot
merged commit da99d89
into
microsoft:main
13 of 15 checks passed
DHowett
pushed a commit
that referenced
this pull request
Jan 25, 2024
In WindowsTerminal, there was a leak of a BSTR with every call to ITextRangeProvider::GetText, and a failure to call VariantClear in ITextRange::GetAttributeValue when the value stored in the variant is VT_BSTR. These were fixed by switching to wil::unique_bstr and wil::unique_variant. (cherry picked from commit da99d89) Service-Card-Id: 91631735 Service-Version: 1.18
DHowett
pushed a commit
that referenced
this pull request
Jan 25, 2024
In WindowsTerminal, there was a leak of a BSTR with every call to ITextRangeProvider::GetText, and a failure to call VariantClear in ITextRange::GetAttributeValue when the value stored in the variant is VT_BSTR. These were fixed by switching to wil::unique_bstr and wil::unique_variant. (cherry picked from commit da99d89) Service-Card-Id: 91631736 Service-Version: 1.19
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In WindowsTerminal, there was a leak of a BSTR with every call to
ITextRangeProvider::GetText, and a failure to call VariantClear in
ITextRange::GetAttributeValue when the value stored in the variant is
VT_BSTR. These were fixed by switching to wil::unique_bstr and
wil::unique_variant.