From 65a9347b1ead3084596a076f9a3de4e6dc44f49b Mon Sep 17 00:00:00 2001 From: James Nugent Date: Wed, 15 Apr 2015 12:13:06 -0700 Subject: [PATCH] Fix potential nil pointer errors in ported code This commit adds extra nil checks for some pointers which were not necessary when using goamz --- builder/amazon/common/ssh.go | 6 +++--- builder/amazon/common/step_run_source_instance.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/builder/amazon/common/ssh.go b/builder/amazon/common/ssh.go index 965a26994..25c71a243 100644 --- a/builder/amazon/common/ssh.go +++ b/builder/amazon/common/ssh.go @@ -17,13 +17,13 @@ func SSHAddress(e *ec2.EC2, port int, private bool) func(multistep.StateBag) (st for j := 0; j < 2; j++ { var host string i := state.Get("instance").(*ec2.Instance) - if *i.VPCID != "" { - if *i.PublicIPAddress != "" && !private { + if i.VPCID != nil && *i.VPCID != "" { + if i.PublicIPAddress != nil && *i.PublicIPAddress != "" && !private { host = *i.PublicIPAddress } else { host = *i.PrivateIPAddress } - } else if *i.PublicDNSName != "" { + } else if i.PublicDNSName != nil && *i.PublicDNSName != "" { host = *i.PublicDNSName } diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go index 644734619..702267c97 100644 --- a/builder/amazon/common/step_run_source_instance.go +++ b/builder/amazon/common/step_run_source_instance.go @@ -261,15 +261,15 @@ func (s *StepRunSourceInstance) Run(state multistep.StateBag) multistep.StepActi } if s.Debug { - if *s.instance.PublicDNSName != "" { + if s.instance.PublicDNSName != nil && *s.instance.PublicDNSName != "" { ui.Message(fmt.Sprintf("Public DNS: %s", *s.instance.PublicDNSName)) } - if *s.instance.PublicIPAddress != "" { + if s.instance.PublicIPAddress != nil && *s.instance.PublicIPAddress != "" { ui.Message(fmt.Sprintf("Public IP: %s", *s.instance.PublicIPAddress)) } - if *s.instance.PrivateIPAddress != "" { + if s.instance.PrivateIPAddress != nil && *s.instance.PrivateIPAddress != "" { ui.Message(fmt.Sprintf("Private IP: %s", *s.instance.PrivateIPAddress)) } }