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

Add nil check before setting timeout on docker client #4303

Merged
merged 1 commit into from
May 22, 2018
Merged

Add nil check before setting timeout on docker client #4303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/driver/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,7 +1099,7 @@ func (d *DockerDriver) newDockerClient(timeout time.Duration) (*docker.Client, e
}
}

if timeout != 0 {
if timeout != 0 && newClient != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

Will the err be set in this case? Otherwise if newClient is nil and the error is nil, it seems like the caller is susceptible to a NPE too

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes the error is always set if newClient is nil. I read through the methods that return a new dockerClient in

nomad/vendor/github.com/fsouza/go-dockerclient/client.go

Line 39 in 5f0f349

)
and it always returns an error if the client is nil.

newClient.SetTimeout(timeout)
}
return newClient, merr.ErrorOrNil()
Expand Down