From edef47b52fd4f65e04629844bfbb833b084a2181 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Sat, 4 Aug 2012 03:07:44 +0000 Subject: [PATCH] escape for xml the material type key and flight data type keys. git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@949 180e2498-e6e9-4542-8430-84ac67f01cd8 --- core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java | 2 +- .../openrocket/file/openrocket/savers/RocketComponentSaver.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java b/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java index e7e42c85..9378a455 100644 --- a/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java +++ b/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java @@ -458,7 +458,7 @@ public class OpenRocketSaver extends RocketSaver { for (int i = 0; i < types.length; i++) { if (i > 0) sb.append(","); - sb.append(types[i].getKey()); + sb.append(escapeXML(types[i].getKey())); } sb.append("\" types=\""); for (int i = 0; i < types.length; i++) { diff --git a/core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java index e009f863..0380eedc 100644 --- a/core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java +++ b/core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java @@ -108,7 +108,7 @@ public class RocketComponentSaver { throw new BugException("Unknown material type: " + mat.getType()); } - return str + " density=\"" + mat.getDensity() + "\" key=\"" + mat.getKey() + "\">" + RocketSaver.escapeXML(mat.getName()) + ""; + return str + " density=\"" + mat.getDensity() + "\" key=\"" + RocketSaver.escapeXML(mat.getKey()) + "\">" + RocketSaver.escapeXML(mat.getName()) + ""; } -- 2.30.2