packer/plugin: fix nil deref during ctrl-c of provisioner

5887472a · Mitchell Hashimoto · 9efc05db · 5887472a · 5887472a
Commit 5887472a authored Aug 28, 2013 by Mitchell Hashimoto
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

CHANGELOG.md CHANGELOG.md +2 -0

packer/plugin/provisioner.go packer/plugin/provisioner.go +1 -1

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
 ## 0.3.6 (unreleased)

+BUG FIXES:

+* core: Fix possible panic when ctrl-C during provisioner run.

 ## 0.3.5 (August 28, 2013)


--- a/packer/plugin/provisioner.go
+++ b/packer/plugin/provisioner.go
@@ -29,7 +29,7 @@ func (c *cmdProvisioner) Provision(ui packer.Ui, comm packer.Communicator) error
 }

 func (c *cmdProvisioner) checkExit(p interface{}, cb func()) {
-	if c.client.Exited() {
+	if c.client.Exited() && cb != nil {
 		cb()
 	} else if p != nil && !Killed {
 		log.Panic(p)