Skip to content
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

Jump to bottom

UIA: Prevent crash from invalid UTR endpoint comparison #5399

Merged
2 commits merged into from
Apr 21, 2020
Merged

UIA: Prevent crash from invalid UTR endpoint comparison #5399

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e5c402
UIA: prevent crash from invalid UTR endpoint comparison
carlos-zamora Apr 17, 2020
a239c69
Apply @codeofdusk's suggestions from code review
carlos-zamora Apr 20, 2020
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
25 changes: 21 additions & 4 deletions src/types/UiaTextRangeBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,17 @@ try
// get the values of our endpoint
const auto mine = GetEndpoint(endpoint);

// TODO GH#5406: create a different UIA parent object for each TextBuffer
// This is a temporary solution to comparing two UTRs from different TextBuffers
// Ensure both endpoints fit in the current buffer.
const auto bufferSize = _pData->GetTextBuffer().GetSize();
if (!bufferSize.IsInBounds(mine, true) || !bufferSize.IsInBounds(other, true))
{
return E_FAIL;
}

// compare them
*pRetVal = _pData->GetTextBuffer().GetSize().CompareInBounds(mine, other, true);
*pRetVal = bufferSize.CompareInBounds(mine, other, true);

UiaTracing::TextRange::CompareEndpoints(*this, endpoint, *range, targetEndpoint, *pRetVal);
return S_OK;
Expand Down Expand Up @@ -652,6 +661,17 @@ try
return E_INVALIDARG;
}

// TODO GH#5406: create a different UIA parent object for each TextBuffer
// This is a temporary solution to comparing two UTRs from different TextBuffers
// Ensure both endpoints fit in the current buffer.
const auto bufferSize = _pData->GetTextBuffer().GetSize();
const auto mine = GetEndpoint(endpoint);
const auto other = range->GetEndpoint(targetEndpoint);
if (!bufferSize.IsInBounds(mine, true) || !bufferSize.IsInBounds(other, true))
{
return E_FAIL;
}

SetEndpoint(endpoint, range->GetEndpoint(targetEndpoint));

UiaTracing::TextRange::MoveEndpointByRange(endpoint, *range, targetEndpoint, *this);
Expand Down Expand Up @@ -768,9 +788,6 @@ CATCH_RETURN();

IFACEMETHODIMP UiaTextRangeBase::GetChildren(_Outptr_result_maybenull_ SAFEARRAY** ppRetVal) noexcept
{
// TODO GitHub #1914: Re-attach Tracing to UIA Tree
//Tracing::s_TraceUia(this, ApiCall::GetChildren, nullptr);

RETURN_HR_IF(E_INVALIDARG, ppRetVal == nullptr);

// we don't have any children
Expand Down