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

[bugfix] panic during child thread iteration #852

Merged
merged 2 commits into from
Sep 26, 2022
Merged

[bugfix] panic during child thread iteration #852

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfbf30c
*actually* start at top of stack loop on find remote child, fix iter …
NyaaaWhatsUpDoc Sep 26, 2022
0a63687
add improved code comment
NyaaaWhatsUpDoc Sep 26, 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
14 changes: 12 additions & 2 deletions internal/federation/dereferencing/thread.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,11 @@ stackLoop:

// Start off the item iterator
current.itemIter = items.Begin()
current.iterIdx = -1
current.iterIdx = 0
}

itemLoop:
for current.iterIdx++; current.iterIdx < current.iterLen; current.iterIdx++ {
for ; current.iterIdx < current.iterLen; current.iterIdx++ {
var itemIRI *url.URL

// Get next item iterator object
Expand Down Expand Up @@ -275,11 +275,21 @@ stackLoop:
continue itemLoop
}

// Iter past this item. Normally this would be
// handled by the third clause of the itemLoop's
// embedded range checking, but at the bottom of this
// loop since we found a new status we circle back to
// the beginning of the stackLoop and skip iteration.
current.iterIdx++

// Put current and next frame at top of stack
stack = append(stack, current, &frame{
statusIRI: itemIRI,
statusable: statusable,
})

// Now start at top of loop
continue stackLoop
}

// Item iterator is done
Expand Down