From abbadcb58be9e15dd31756351f39699636ba3b0b Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 17 Nov 2014 20:45:00 +0100
Subject: [PATCH] avoided some null pointers

---
 .../generator/AbstractGenerator.java          |  2 +-
 .../siacs/conversations/parser/IqParser.java  | 49 +++++++++++--------
 .../xmpp/stanzas/AbstractStanza.java          |  8 ++-
 3 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
index d1b76c3f8..419964eae 100644
--- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
@@ -20,7 +20,7 @@ public abstract class AbstractGenerator {
 			"http://jabber.org/protocol/disco#info",
 			"urn:xmpp:avatar:metadata+notify",
 			"urn:xmpp:ping"};
-	public final String IDENTITY_NAME = "Conversations 0.8.3";
+	public final String IDENTITY_NAME = "Conversations 0.9-alpha";
 	public final String IDENTITY_TYPE = "phone";
 
 	protected XmppConnectionService mXmppConnectionService;
diff --git a/src/main/java/eu/siacs/conversations/parser/IqParser.java b/src/main/java/eu/siacs/conversations/parser/IqParser.java
index 48b8ef544..adcb11080 100644
--- a/src/main/java/eu/siacs/conversations/parser/IqParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/IqParser.java
@@ -1,5 +1,8 @@
 package eu.siacs.conversations.parser;
 
+import android.util.Log;
+
+import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.services.XmppConnectionService;
@@ -68,32 +71,36 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
 	@Override
 	public void onIqPacketReceived(Account account, IqPacket packet) {
 		if (packet.hasChild("query", "jabber:iq:roster")) {
-            final Jid from = packet.getFrom();
-            if ((from == null) || (from.equals(account.getJid().toBareJid()))) {
+			final Jid from = packet.getFrom();
+			if ((from == null) || (from.equals(account.getJid().toBareJid()))) {
 				Element query = packet.findChild("query");
 				this.rosterItems(account, query);
 			}
-		} else if (packet.hasChild("open", "http://jabber.org/protocol/ibb")
-				|| packet.hasChild("data", "http://jabber.org/protocol/ibb")) {
-			mXmppConnectionService.getJingleConnectionManager()
-					.deliverIbbPacket(account, packet);
-		} else if (packet.hasChild("query",
-				"http://jabber.org/protocol/disco#info")) {
-			IqPacket response = mXmppConnectionService.getIqGenerator()
-					.discoResponse(packet);
-			account.getXmppConnection().sendIqPacket(response, null);
-		} else if (packet.hasChild("ping", "urn:xmpp:ping")) {
-			IqPacket response = packet.generateRespone(IqPacket.TYPE_RESULT);
-			mXmppConnectionService.sendIqPacket(account, response, null);
 		} else {
-			if ((packet.getType() == IqPacket.TYPE_GET)
-					|| (packet.getType() == IqPacket.TYPE_SET)) {
-				IqPacket response = packet.generateRespone(IqPacket.TYPE_ERROR);
-				Element error = response.addChild("error");
-				error.setAttribute("type", "cancel");
-				error.addChild("feature-not-implemented",
-						"urn:ietf:params:xml:ns:xmpp-stanzas");
+			if (packet.getFrom() == null) {
+				Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": received iq with invalid from "+packet.toString());
+				return;
+			} else if (packet.hasChild("open", "http://jabber.org/protocol/ibb")
+					|| packet.hasChild("data", "http://jabber.org/protocol/ibb")) {
+				mXmppConnectionService.getJingleConnectionManager()
+						.deliverIbbPacket(account, packet);
+			} else if (packet.hasChild("query", "http://jabber.org/protocol/disco#info")) {
+				IqPacket response = mXmppConnectionService.getIqGenerator()
+						.discoResponse(packet);
 				account.getXmppConnection().sendIqPacket(response, null);
+			} else if (packet.hasChild("ping", "urn:xmpp:ping")) {
+				IqPacket response = packet.generateRespone(IqPacket.TYPE_RESULT);
+				mXmppConnectionService.sendIqPacket(account, response, null);
+			} else {
+				if ((packet.getType() == IqPacket.TYPE_GET)
+						|| (packet.getType() == IqPacket.TYPE_SET)) {
+					IqPacket response = packet.generateRespone(IqPacket.TYPE_ERROR);
+					Element error = response.addChild("error");
+					error.setAttribute("type", "cancel");
+					error.addChild("feature-not-implemented",
+							"urn:ietf:params:xml:ns:xmpp-stanzas");
+					account.getXmppConnection().sendIqPacket(response, null);
+				}
 			}
 		}
 	}
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
index eade220aa..9e0514729 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
@@ -36,11 +36,15 @@ public class AbstractStanza extends Element {
 	}
 
 	public void setTo(final Jid to) {
-		setAttribute("to", to.toString());
+		if (to != null) {
+			setAttribute("to", to.toString());
+		}
 	}
 
 	public void setFrom(final Jid from) {
-		setAttribute("from", from.toString());
+		if (from != null) {
+			setAttribute("from", from.toString());
+		}
 	}
 
 	public void setId(final String id) {