E54A [18.03 backport] Fix possible nil pointer exception by thaJeztah · Pull Request #2326 · moby/libnetwork · GitHub
[go: up one dir, main page]
Skip to content

[18.03 backport] Fix possible nil pointer exception #2326

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
Merged
merged 2 commits into from
Jan 23, 2019
Merged

[18.03 backport] Fix possible nil pointer exception #2326

merged 2 commits into from
Jan 23, 2019

Conversation

thaJeztah
Copy link
Member

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

git checkout -b 18.03_backport_fix_crash upstream/bump_18.03
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
Contributor
selansen commented Jan 23, 2019 •
edited
Loading

Interesting gosimple failure in a file which is not part of this commit.

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

@fcrisciani
Copy link

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

Flavio Crisciani added 2 commits January 23, 2019 16:19
@thaJeztah
Fix gosimple
bda0583 
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
(cherry picked from commit fd6be31)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Fix possible nil pointer exception
6b93786 
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.03_backport_fix_crash branch from a9595a4 to 6b93786 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

@fcrisciani fcrisciani merged commit 3e2444e into moby:bump_18.03 Jan 23, 2019
@thaJeztah thaJeztah deleted the 18.03_backport_fix_crash branch January 23, 2019 15:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@fcrisciani fcrisciani fcrisciani approved these changes

Reviewers whose approvals may not affect merge requirements 50BF
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
0