From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 15 Oct 2010 20:49:11 +0000 (+0200)
Subject: Don’t crash on parsing incorrect XML.
X-Git-Tag: 0.1-RC1~309
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=3fd1050cc49a462ebe956ffaac7ea6b866bbeb9f

Don’t crash on parsing incorrect XML.
---

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index 4dd634c..a36c17a 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -137,7 +137,14 @@ public class SoneDownloader extends AbstractService {
 			xmlBucket = fetchResult.asBucket();
 			xmlInputStream = xmlBucket.getInputStream();
 			Document document = XML.transformToDocument(xmlInputStream);
-			SimpleXML soneXml = SimpleXML.fromDocument(document);
+			SimpleXML soneXml;
+			try {
+				soneXml = SimpleXML.fromDocument(document);
+			} catch (NullPointerException npe1) {
+				/* for some reason, invalid XML can cause NPEs. */
+				logger.log(Level.WARNING, "XML for Sone " + sone + " can not be parsed!", npe1);
+				return;
+			}
 
 			/* check ID. */
 			String soneId = soneXml.getValue("id", null);