Skip to content

[18.09 backport] Fix possible nil pointer exception#2327

Merged
fcrisciani merged 2 commits intomoby:bump_18.09from
thaJeztah:18.09_backport_fix_crash
Jan 23, 2019
Merged

[18.09 backport] Fix possible nil pointer exception#2327
fcrisciani merged 2 commits intomoby:bump_18.09from
thaJeztah:18.09_backport_fix_crash

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
Contributor

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

Signed-off-by: Flavio Crisciani <[email protected]>
(cherry picked from commit fd6be31)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@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 😕

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 <[email protected]>
(cherry picked from commit 1954e1c)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
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

Copy link
Contributor

@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
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