Changeset 5438

Timestamp:

09/26/07 06:09:00 (14 months ago)

Author:

erijo

Message:

Check that the user returned from UserManager? isn't NULL before using
it. Will hopefully fix #1520.

Files:

• trunk/qt-gui/src/userbox.cpp (modified) (9 diffs)

trunk/qt-gui/src/userbox.cpp

@@ -1706 +1706 @@
     QRect r(itemRect(item));
     ICQUser *u = gUserManager.FetchUser(item->m_szId, item->m_nPPID, LOCK_R);
-    QTextCodec * codec = UserCodec::codecForICQUser(u);
+
     QString strFileName = "";
     if (u && u->GetPicturePresent() && gMainWindow->m_bPopPicture)
     {
-      const QString file = QString("%1/%2/%3.pic").arg(BASE_DIR).arg(USER_DIR).arg(u->IdString());
+      const QString file =
+          QString("%1/%2/%3.pic").arg(BASE_DIR).arg(USER_DIR).arg(u->IdString());
       const QImage picture = QImage(file);
       if (!picture.isNull())
@@ -1719 +1720 @@
     }
 
-    QString s = strFileName + QString("<nobr>") + QString(ICQUser::StatusToStatusStr(item->m_nStatus, item->m_bStatusInvisible))
-      + QString("</nobr>");
-    
-    if (*u->GetAlias() && gMainWindow->m_bPopAlias)
+    QString s = strFileName + QString("<nobr>") +
+        QString(ICQUser::StatusToStatusStr(item->m_nStatus,
+                                           item->m_bStatusInvisible)) +
+        QString("</nobr>");
+
+    QTextCodec* codec = UserCodec::defaultEncoding();
+    if (u != NULL)
+      codec = UserCodec::codecForICQUser(u);
+
+    if (u && *u->GetAlias() && gMainWindow->m_bPopAlias)
       s += tr("<br><nobr>") + QString::fromUtf8(u->GetAlias()) + tr("</nobr>");
 
-    if ((*u->GetFirstName() || *u->GetLastName()) && gMainWindow->m_bPopName)
+    if (u && (*u->GetFirstName() || *u->GetLastName()) && gMainWindow->m_bPopName)
     {
       s += tr("<br><nobr>");
@@ -1764 +1771 @@
       s += tr("<br>Custom&nbsp;Auto&nbsp;Response");
 
-    if (u != NULL)
-    {
-      if (!u->StatusOffline() && u->ClientInfo() && *u->ClientInfo())
+    if (u && !u->StatusOffline() && u->ClientInfo() && *u->ClientInfo())
       s += tr("<br><nobr>") + codec->toUnicode(u->ClientInfo()) + tr("</nobr>");
       
-      if (u->AutoResponse() && *u->AutoResponse() &&
-          item->m_nStatus != ICQ_STATUS_OFFLINE &&
-          item->m_nStatus != ICQ_STATUS_ONLINE)
-        s += tr("<br><u>Auto Response:</u>") + codec->toUnicode(u->AutoResponse());
-      gUserManager.DropUser(u);
-    }
-
-    if (*u->GetEmailPrimary() && gMainWindow->m_bPopEmail)
-      s += tr("<br><nobr>E: ") + codec->toUnicode(u->GetEmailPrimary()) + tr("</nobr>");
-
-    if (item->m_bPhone && gMainWindow->m_bPopPhone)
-      s += tr("<br><nobr>P: ") + codec->toUnicode(u->GetPhoneNumber()) + tr("</nobr>");
-
-    if (item->m_bCellular && gMainWindow->m_bPopCellular)
-      s += tr("<br><nobr>C: ") + codec->toUnicode(u->GetCellularNumber()) + tr("</nobr>");
-
-    if ((u->GetFaxNumber()[0]!='\0') && gMainWindow->m_bPopEmail)
-      s += tr("<br><nobr>F: ") + codec->toUnicode(u->GetFaxNumber()) + tr("</nobr>");
-
-    if ((u->Ip() || u->IntIp()) && gMainWindow->m_bPopIP) {
+    if (u && u->AutoResponse() && *u->AutoResponse() &&
+    item->m_nStatus != ICQ_STATUS_OFFLINE &&
+    item->m_nStatus != ICQ_STATUS_ONLINE)
+      s += tr("<br><u>Auto Response:</u>") + codec->toUnicode(u->AutoResponse());
+
+    if (u && *u->GetEmailPrimary() && gMainWindow->m_bPopEmail)
+      s += tr("<br><nobr>E: ") + codec->toUnicode(u->GetEmailPrimary()) +
+    tr("</nobr>");
+
+    if (u && item->m_bPhone && gMainWindow->m_bPopPhone)
+      s += tr("<br><nobr>P: ") + codec->toUnicode(u->GetPhoneNumber()) +
+    tr("</nobr>");
+
+    if (u && item->m_bCellular && gMainWindow->m_bPopCellular)
+      s += tr("<br><nobr>C: ") + codec->toUnicode(u->GetCellularNumber()) +
+    tr("</nobr>");
+
+    if (u && (u->GetFaxNumber()[0]!='\0') && gMainWindow->m_bPopEmail)
+      s += tr("<br><nobr>F: ") + codec->toUnicode(u->GetFaxNumber()) +
+    tr("</nobr>");
+
+    if (u && (u->Ip() || u->IntIp()) && gMainWindow->m_bPopIP)
+    {
       char buf_ip[32];
       char buf_int_ip[32];
@@ -1799 +1807 @@
     }
 
-    if ((u->LastOnline()>0) && gMainWindow->m_bPopLastOnline) {
+    if (u && (u->LastOnline()>0) && gMainWindow->m_bPopLastOnline)
+    {
       QDateTime t;
       t.setTime_t(u->LastOnline());
@@ -1806 +1815 @@
     }
 
-    if ((!u->StatusOffline()) && gMainWindow->m_bPopOnlineSince) {
+    if (u && (!u->StatusOffline()) && gMainWindow->m_bPopOnlineSince)
+    {
       time_t nLoggedIn = time(0) - u->OnlineSince();
       unsigned long nWeek, nDay, nHour, nMinute;
@@ -1848 +1858 @@
     if (gMainWindow->m_bPopIdleTime)
     {
-      if (u->IdleSince())
+      if (u && u->IdleSince())
       {
         char *szTemp;
@@ -1858 +1868 @@
     }
 
-    if (gMainWindow->m_bPopLocalTime)
+    if (u && gMainWindow->m_bPopLocalTime)
     {
       char *szTemp;
@@ -1867 +1877 @@
     }
 
-    if (gMainWindow->m_bPopID)
+    if (u && gMainWindow->m_bPopID)
     {
       char *szTemp;
@@ -1876 +1886 @@
     }
 
+    gUserManager.DropUser(u);
+
     tip(r, s);
   }