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

[18.09 backport] Fix possible nil pointer exception #2327

Merged
merged 2 commits into from
Jan 23, 2019
Merged

[18.09 backport] Fix possible nil pointer exception #2327

merged 2 commits into from
Jan 23, 2019

Conversation

thaJeztah
Copy link
Member

backport of #2325 for 18.09
relates to moby/moby#38618

git checkout -b 18.09_backport_fix_crash upstream/bump_18.09
git cherry-pick -s -S -x 1954e1c4b2cbdac2ef851acba12ead3ff6791290
git push -u origin

cherry-pick was clean; no conflicts

It is possible that the node is not yet present in
the node list map. In this case just print a warning
and return. The next iteration would be fine

@selansen
Copy link
Collaborator

Same as other back port.

🐳 gosimple
Gosimple has been deprecated. Please use staticcheck instead.
default_gateway.go:185:3: when ok is true, err can't be nil (S1020)
Makefile:168: recipe for target 'gosimple' failed```

@fcrisciani
Copy link

can you also add this commit? #2320 that fixes the gosimple

@thaJeztah
Copy link
Member Author

Ah, need to backport #2320 to the release branches

@thaJeztah
Copy link
Member Author

LOL, yes, so that ^^ haha

@fcrisciani
Copy link

ahah I was 3s faster :D

@thaJeztah
Fix gosimple
7a5f198 
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
(cherry picked from commit fd6be31)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

I opened separate pull requests for them (for all the release branches)

@fcrisciani
Copy link

@thaJeztah the problem is that also this PR fix a gosimple issue. so the other PR will still fail

@thaJeztah
Copy link
Member Author

Ah, gotcha; probably need to take just that bit from the PR to backport to 17.06 😕

@thaJeztah
Fix possible nil pointer exception
d20ece4 
It is possible that the node is not yet present in
the node list map. In this case just print a warning
and return. The next iteration would be fine

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
(cherry picked from commit 1954e1c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 18.09_backport_fix_crash branch from 160db4f to d20ece4 Compare January 23, 2019 15:35
@thaJeztah thaJeztah mentioned this pull request Jan 23, 2019
Closed
fcrisciani
fcrisciani approved these changes Jan 23, 2019
View reviewed changes
Copy link

@fcrisciani fcrisciani left a comment

Choose a reason for hiding this comment

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

LGTM, failure is unrelated

selansen
selansen approved these changes Jan 23, 2019
View reviewed changes
Copy link
Collaborator

@selansen selansen left a comment

Choose a reason for hiding this comment

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

LGTM

@fcrisciani fcrisciani merged commit 664e931 into moby:bump_18.09 Jan 23, 2019
@thaJeztah thaJeztah deleted the 18.09_backport_fix_crash branch January 23, 2019 18:22
@thaJeztah thaJeztah mentioned this pull request Mar 5, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@selansen selansen selansen approved these changes

@fcrisciani fcrisciani fcrisciani approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@thaJeztah @selansen @fcrisciani