Skip to content

[19.03 backport] resolver panic backport#2541

Merged
thaJeztah merged 1 commit intomoby:bump_19.03from
SamWhited:19.03_resolver_panic_backport
Mar 19, 2020
Merged

[19.03 backport] resolver panic backport#2541
thaJeztah merged 1 commit intomoby:bump_19.03from
SamWhited:19.03_resolver_panic_backport

Conversation

@SamWhited
Copy link
Contributor

See #2540

@arkodg
Copy link
Contributor

arkodg commented Mar 18, 2020

once the master commit has been committed can you please use cherry-pick -x to create this commit

@SamWhited
Copy link
Contributor Author

Oh nifty, I wasn't aware of the -x option. Will do.

Under certain conditions it appears that the DNS response and returned
error can be nil. When this happens, checking resp.Truncated results in
a nil panic so we must first check that the response is not nil before
checking if a truncated response was received.

See moby/moby#40715

Signed-off-by: Sam Whited <[email protected]>
(cherry picked from commit bea32b0)
@SamWhited
Copy link
Contributor Author

Re-cherry-picked again to make tests pass. Everything seems green now. /cc @thaJeztah

Copy link
Contributor

@arkodg arkodg left a comment

Choose a reason for hiding this comment

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

LGTM

@SamWhited SamWhited changed the title 19.03 resolver panic backport [19.03 backport] resolver panic backport Mar 18, 2020
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah thaJeztah merged commit 0941c3f into moby:bump_19.03 Mar 19, 2020
@SamWhited SamWhited deleted the 19.03_resolver_panic_backport branch March 19, 2020 12:36
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.

3 participants