Repository: cloudstack Updated Branches: refs/heads/master 7949d2922 -> ccf13ec04
kvm: xml escape password (cherry picked from commit 13de2691fddb4b755605ee44ac0e95dedb26987d) Signed-off-by: Rohit Yadav <[email protected]> Conflicts: plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ccf13ec0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ccf13ec0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ccf13ec0 Branch: refs/heads/master Commit: ccf13ec04eb1f04ca35a99cdb9d53e838b3148ed Parents: 7949d29 Author: Rohit Yadav <[email protected]> Authored: Mon Apr 13 16:04:40 2015 +0530 Committer: Rohit Yadav <[email protected]> Committed: Mon Apr 13 16:10:42 2015 +0530 ---------------------------------------------------------------------- .../kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ccf13ec0/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java index b5723ed..5c8d337 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java @@ -16,6 +16,8 @@ // under the License. package com.cloud.hypervisor.kvm.resource; +import org.apache.commons.lang.StringEscapeUtils; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -1168,7 +1170,7 @@ public class LibvirtVMDef { _port = port; _autoPort = autoPort; _listenAddr = listenAddr; - _passwd = passwd; + _passwd = StringEscapeUtils.escapeXml(passwd); _keyMap = keyMap; }
