Changeset 6787 in josm for trunk/src

Timestamp:

2014-01-30T18:02:53+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9647 - filter invalid XML characters in changeset API responses

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• InvalidXmlCharacterFilter.java (modified) (3 diffs)
• OsmChangesetParser.java (modified) (2 diffs)
• OsmServerReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/InvalidXmlCharacterFilter.java

@@ -36 +36 @@
     }
 
+    /**
+     * Constructs a new {@code InvalidXmlCharacterFilter} for the given Reader.
+     * @param reader The reader to filter
+     */
     public InvalidXmlCharacterFilter(Reader reader) {
         this.reader = reader;
@@ -60 +64 @@
         if (in < 0x20 && in >= 0 && INVALID_CHARS[in]) {
             if (firstWarning) {
-                Main.warn("Invalid xml character encountered.");
+                Main.warn("Invalid xml character encountered: '"+in+"'.");
                 firstWarning = false;
             }
@@ -67 +71 @@
         return in;
     }
-
 }

trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java

@@ -154 +154 @@
         }
 
-        @Override public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
+        @Override
+        public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
             if (qName.equals("osm")) {
                 if (atts == null) {
@@ -215 +216 @@
             progressMonitor.beginTask("");
             progressMonitor.indeterminateSubTask(tr("Parsing list of changesets..."));
-            InputSource inputSource = new InputSource(new InputStreamReader(source, Utils.UTF_8));
+            InputSource inputSource = new InputSource(new InvalidXmlCharacterFilter(new InputStreamReader(source, Utils.UTF_8)));
             SAXParserFactory.newInstance().newSAXParser().parse(inputSource, parser.new Parser());
             return parser.getChangesets();

trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

@@ -87 +87 @@
         return getInputStreamRaw(urlStr, progressMonitor, null);
     }
-    
+
     /**
      * Open a connection to the given url and return a reader on the input stream
@@ -151 +151 @@
                     String errorHeader = activeConnection.getHeaderField("Error");
                     StringBuilder errorBody = new StringBuilder();
-                    try
-                    {
-                        InputStream i = FixEncoding(activeConnection.getErrorStream(), encoding);
+                    try {
+                        InputStream i = fixEncoding(activeConnection.getErrorStream(), encoding);
                         if (i != null) {
                             BufferedReader in = new BufferedReader(new InputStreamReader(i));
@@ -170 +169 @@
                 }
 
-                return FixEncoding(new ProgressInputStream(activeConnection, progressMonitor), encoding);
+                return fixEncoding(new ProgressInputStream(activeConnection, progressMonitor), encoding);
             } catch (OsmTransferException e) {
                 throw e;
@@ -181 +180 @@
     }
 
-    private InputStream FixEncoding(InputStream stream, String encoding) throws IOException
-    {
+    private InputStream fixEncoding(InputStream stream, String encoding) throws IOException {
         if ("gzip".equalsIgnoreCase(encoding)) {
             stream = new GZIPInputStream(stream);
-        }
-        else if ("deflate".equalsIgnoreCase(encoding)) {
+        } else if ("deflate".equalsIgnoreCase(encoding)) {
             stream = new InflaterInputStream(stream, new Inflater(true));
         }