mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-10-30 04:11:39 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-2349: fix NPE when adding yourself to contact list

Browse Source 
In this case you'll get the presence from PresenceManager constants that doesn't have the from field.
This make a two NPEs.
This commit is contained in:
Sergey Ponomarev 2025-09-20 11:26:59 +03:00 committed by Guus der Kinderen
parent dc0f625f25
commit 443f6441fb
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/jivesoftware/spark/ui/ContactList.java
View File

@ -316,6 +316,9 @@ public class ContactList extends JPanel implements ActionListener,
// We ignore this. // We ignore this.
return; return;
} }
if (presence.getFrom() == null) {
return;
}
final Roster roster = Roster.getInstanceFor(SparkManager.getConnection()); final Roster roster = Roster.getInstanceFor(SparkManager.getConnection());

7
core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/GatewayPlugin.java
View File

@ -41,6 +41,7 @@ import org.jivesoftware.sparkimpl.settings.local.LocalPreferences;
import org.jivesoftware.sparkimpl.settings.local.SettingsManager; import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
import org.jxmpp.jid.BareJid; import org.jxmpp.jid.BareJid;
import org.jxmpp.jid.DomainBareJid; import org.jxmpp.jid.DomainBareJid;
import org.jxmpp.jid.Jid;
import javax.swing.*; import javax.swing.*;
@ -285,7 +286,11 @@ public class GatewayPlugin implements Plugin, ContactItemHandler {
@Override @Override
public boolean handlePresence(ContactItem item, Presence presence) { public boolean handlePresence(ContactItem item, Presence presence) {
if (presence.isAvailable()) { if (presence.isAvailable()) {
DomainBareJid domain = presence.getFrom().asDomainBareJid(); Jid from = presence.getFrom();
if (from == null) {
return false;
}
DomainBareJid domain = from.asDomainBareJid();
Transport transport = TransportUtils.getTransport(domain); Transport transport = TransportUtils.getTransport(domain);
if (transport != null) { if (transport != null) {
if (presence.getType() == Presence.Type.available) { if (presence.getType() == Presence.Type.available) {