summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Atallah <datallah@pidgin.im>2007-10-10 00:44:34 +0000
committerDaniel Atallah <datallah@pidgin.im>2007-10-10 00:44:34 +0000
commit79cf65776fd431cf6006660033f6858116ee5133 (patch)
tree967db39ffb82117035996ffd7137b14bdfea45bc
parentd12d0b52935988f77f1cfa74381adc78474f7dc1 (diff)
downloadpidgin-79cf65776fd431cf6006660033f6858116ee5133.tar.gz
Fix CID 340; potential NULL deref.
-rw-r--r--libpurple/protocols/oscar/oscar.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
index 6dc5b7e758..eaa10d3d1f 100644
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -1128,8 +1128,10 @@ flap_connection_established_chat(OscarData *od, FlapConnection *conn)
aim_clientready(od, conn);
chatcon = find_oscar_chat_by_conn(gc, conn);
- chatcon->id = id;
- chatcon->conv = serv_got_joined_chat(gc, id++, chatcon->show);
+ if (chatcon) {
+ chatcon->id = id;
+ chatcon->conv = serv_got_joined_chat(gc, id++, chatcon->show);
+ }
}
static void