github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-22 02:21:34 +00:00
Code Issues Projects Releases Wiki Activity

aws: Fix panic when there is no console output

Browse Source 
When an AWS machine is stopped and there is no console output the CLI
panics due to a nil pointer dereference. This commit checks that the
console output is not null before attempting to decode it.

Signed-off-by: Dave Tucker <dt@docker.com>
This commit is contained in:
Dave Tucker 2017-08-10 17:28:09 +01:00
parent d2b7782419
commit 90bf0cc2f6
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cmd/linuxkit/run_aws.go
View File

@ -167,12 +167,15 @@ func runAWS(args []string) {
log.Fatalf("Error getting output from instance %s: %s", *instanceID, err) log.Fatalf("Error getting output from instance %s: %s", *instanceID, err)
} }
out, err := base64.StdEncoding.DecodeString(*output.Output) if output.Output == nil {
if err != nil { log.Warn("No Console Output found")
log.Fatalf("Error decoding output: %s", err) } else {
out, err := base64.StdEncoding.DecodeString(*output.Output)
if err != nil {
log.Fatalf("Error decoding output: %s", err)
}
fmt.Printf(string(out) + "\n")
} }
fmt.Printf(string(out) + "\n")
log.Infof("Terminating instance %s", *instanceID) log.Infof("Terminating instance %s", *instanceID)
terminateParams := &ec2.TerminateInstancesInput{ terminateParams := &ec2.TerminateInstancesInput{
InstanceIds: []*string{instanceID}, InstanceIds: []*string{instanceID},