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.

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

HP Secure Browser support (#16377): Detect & prevent infinite loop in iterUIARangeByUnit #16394

Merged
merged 1 commit into from Apr 16, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion source/UIAHandler/utils.py
Expand Up @@ -124,13 +124,19 @@ def iterUIARangeByUnit(rangeObj,unit,reverse=False):
tempRange.MoveEndpointByRange(Endpoint_relativeEnd,rangeObj,Endpoint_relativeStart)
endRange=tempRange.Clone()
loopCount = 0
yieldRange = None
while relativeGTOperator(endRange.Move(unit,minRelativeDistance),0):
loopCount += 1
tempRange.MoveEndpointByRange(Endpoint_relativeEnd,endRange,Endpoint_relativeStart)
pastEnd=relativeGTOperator(tempRange.CompareEndpoints(Endpoint_relativeEnd,rangeObj,Endpoint_relativeEnd),0)
if pastEnd:
tempRange.MoveEndpointByRange(Endpoint_relativeEnd,rangeObj,Endpoint_relativeEnd)
yield tempRange.clone()
if yieldRange and bool(yieldRange.compare(tempRange)):
# we've looped onto range we've already yielded previously - shortcircuit to prevent
# infinite loop
return
yieldRange = tempRange.clone()
yield yieldRange
if pastEnd:
return
tempRange.MoveEndpointByRange(Endpoint_relativeStart,tempRange,Endpoint_relativeEnd)
Expand Down