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

diff --git a/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java b/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java
index e7e42c85b5b3f3c0ccfe34edca88ebc18d035d14..9378a455131ef739a2c1d632aa08b4a5dfedd15f 100644 (file)
--- 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 e009f863770a0a415d47c5c3af53aa1396dd8e05..0380eedcabda86653aba680203f7e5d1842d53ba 100644 (file)
--- 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()) + "</" + tag + ">";
+               return str + " density=\"" + mat.getDensity() + "\" key=\"" + RocketSaver.escapeXML(mat.getKey()) + "\">" + RocketSaver.escapeXML(mat.getName()) + "</" + tag + ">";
        }