Fix loop when parsing broken gpx files

bailuk · Nov 3, 2019 · 01d00a7 · 01d00a7 · bailuk · Nov 17, 2019
1 parent f13c0e2
commit 01d00a7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/app/src/main/java/ch/bailu/aat/gpx/xml_parser/parser/TagParser.java b/app/src/main/java/ch/bailu/aat/gpx/xml_parser/parser/TagParser.java
@@ -63,8 +63,10 @@ private boolean begins(XmlPullParser parser) throws XmlPullParserException {
     }
 
     private boolean ends(XmlPullParser parser) throws XmlPullParserException {
-        return parser.getEventType() == XmlPullParser.END_TAG
-                && (tag == null || Objects.equals(parser.getName(), tag));
+        return parser.getEventType() == XmlPullParser.END_DOCUMENT ||
+
+                (parser.getEventType() == XmlPullParser.END_TAG &&
+                        (tag == null || Objects.equals(parser.getName(), tag)));
     }
 
 

diff --git a/app/src/main/java/ch/bailu/aat/gpx/xml_parser/parser/Util.java b/app/src/main/java/ch/bailu/aat/gpx/xml_parser/parser/Util.java
@@ -6,22 +6,32 @@
 import java.io.IOException;
 
 import ch.bailu.aat.gpx.xml_parser.scanner.Scanner;
+import ch.bailu.aat.util.ui.AppLog;
 import ch.bailu.util_java.util.Objects;
 
 public class Util {
 
+    /**
+     * Read until tag ends or document ends
+     *
+     * @param parser
+     * @throws IOException
+     * @throws XmlPullParserException
+     */
     public static void skipTag(XmlPullParser parser) throws IOException, XmlPullParserException {
-        String tag = parser.getName();
+        final String tag = parser.getName();
 
-        // log(parser);
-        while(tag != null) {
+        while (tag != null) {
 
             int event = parser.next();
 
             if (event == XmlPullParser.END_TAG
                     && Objects.equals(tag, parser.getName())) {
-                // log(parser);
                 return;
+
+            } else if (event == XmlPullParser.END_DOCUMENT) {
+                return;
+
             }
         }
     }