haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

communicators/ssh: more nil guards [GH-6225]

This commit is contained in:
Mitchell Hashimoto 2015-11-18 17:32:40 -08:00
parent 6f3ed13f75
commit eb5a6fc7c3
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -50,6 +50,7 @@ BUG FIXES:
- core: use the correct private key when packaging a box [GH-6406] - core: use the correct private key when packaging a box [GH-6406]
- commands/rdp: prefer `xfreerdp` if it is available on Linux [GH-6475] - commands/rdp: prefer `xfreerdp` if it is available on Linux [GH-6475]
- commands/up: the `--provision-with` flag works with provisioner names [GH-5981] - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
- communicator/ssh: fix potential crash case with PTY [GH-6225]
- communicator/winrm: respect `boot_timeout` setting [GH-6229] - communicator/winrm: respect `boot_timeout` setting [GH-6229]
- communicator/winrm: execute scheduled tasks immediately on Windows XP - communicator/winrm: execute scheduled tasks immediately on Windows XP
since elevation isn't required [GH-6195] since elevation isn't required [GH-6195]

1
plugins/communicators/ssh/communicator.rb
View File

@ -611,6 +611,7 @@ module VagrantPlugins
end end
data = pty_stdout[/.*#{PTY_DELIM_START}(.*?)#{PTY_DELIM_END}/m, 1] data = pty_stdout[/.*#{PTY_DELIM_START}(.*?)#{PTY_DELIM_END}/m, 1]
data ||= ""
@logger.debug("PTY stdout parsed: #{data}") @logger.debug("PTY stdout parsed: #{data}")
yield :stdout, data if block_given? yield :stdout, data if block_given?
end end