Skip to content

fix: Add isFirst check before err check#4326

Merged
kylecarbs merged 1 commit into
mainfrom
fixblock
Oct 3, 2022
Merged

fix: Add isFirst check before err check#4326
kylecarbs merged 1 commit into
mainfrom
fixblock

Conversation

@kylecarbs

Copy link
Copy Markdown
Member

This was causing TestBlockNonBrowser to hang and fail.

This was causing TestBlockNonBrowser to hang and fail.
@kylecarbs kylecarbs requested a review from mafredri October 3, 2022 14:47
@kylecarbs kylecarbs self-assigned this Oct 3, 2022
@kylecarbs

Copy link
Copy Markdown
Member Author

Force merging this because CI is in shambles right now!

@kylecarbs kylecarbs merged commit 88d49db into main Oct 3, 2022
@kylecarbs kylecarbs deleted the fixblock branch October 3, 2022 14:51
}
if isFirst {
if res.StatusCode == http.StatusConflict {
if err != nil && res.StatusCode == http.StatusConflict {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be err == nil? Thinking this will still have the potential nil pointer deref if err != nil?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh, you're correct. I'll fix this now in another PR. I merged due to panic of main being busted!

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems the error isn't nil there actually, so a weird case. I'm just going to check for the status code, then it should be fine!

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants