Changeset 4023 for trunk/console

Timestamp:

02/22/05 00:36:37 (4 years ago)

Author:

emostar

Message:

Fix a crash that was caused my an uninitialized pointer. Also a few pointer checks..

Location:

trunk/console/src

Files:

• console.cpp (modified) (2 diffs)
• console_print.cpp (modified) (3 diffs)

trunk/console/src/console.cpp

@@ -210 +210 @@
 
   m_bExit = false;
+  cdkUserList = 0;
 }
 
@@ -291 +292 @@
   else
   {
-    ICQOwner *o = gUserManager.FetchOwner(LOCK_R);
+    ICQOwner *o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
     if (o->Password()[0] == '\0')
     {

trunk/console/src/console_print.cpp

@@ -386 +386 @@
     s->pos = i;
     s->nPPID = (*it)->nPPID;
-    s->color = (*it)->color;
+        s->color = (*it)->color;
     sprintf(s->szId, "%s", (*it)->szId);
     
@@ -416 +416 @@
  * CLicqConsole::UserListHighlight
  *-------------------------------------------------------------------------*/
-void CLicqConsole::UserListHighlight(chtype type, chtype input) {
+void CLicqConsole::UserListHighlight(chtype type, chtype input)
+{
   // There has got to be a better way to do this...
   list <SScrollUser *>::iterator it;
@@ -428 +429 @@
   for (it = m_lScrollUsers.begin(); it != m_lScrollUsers.end(); it++)
   {
-    if ((*it)->pos == cdkUserList->currentItem + down)
+    if ((*it)->pos == (cdkUserList->currentItem + down))
     {
       ICQUser *u = gUserManager.FetchUser((*it)->szId, (*it)->nPPID, LOCK_R);
-      if (u->NewMessages())
+      if (u && u->NewMessages())
         setCDKScrollHighlight(cdkUserList, COLOR_PAIR((*it)->color->nColor - 6) | type);
       else