Changeset 4184 for trunk/console

Timestamp:

08/13/05 10:32:14 (3 years ago)

Author:

phatfil

Message:

fix a couple of crashes (viewing history, last user) when user aliases were > 32 chars

Location:

trunk/console/src

Files:

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

trunk/console/src/console.cpp

@@ -1769 +1769 @@
     return;
   }
-  char szFrom[32];
+  char *szFrom;
   if (gUserManager.FindOwner(szId, nPPID))
-    strcpy(szFrom, "Server");
+    szFrom = "Server\0";
   else
-    strcpy(szFrom, u->GetAlias());
+    szFrom = strdup(u->GetAlias());
   gUserManager.DropUser(u);
 
@@ -1791 +1791 @@
       winMain->wprintf("%CNo System Events.\n", 8);
     }
+    free(szFrom);
     return;
   }
@@ -1807 +1808 @@
     winMain->wprintf("%CInvalid start range: %A%s\n", 16,
                      A_BOLD, szStart);
+    free(szFrom);
     return;
   }
@@ -1813 +1815 @@
     winMain->wprintf("%CStart value out of range, history contains %d events.\n",
                      16, nLast);
+    free(szFrom);
     return;
   }
@@ -1823 +1826 @@
       winMain->wprintf("%CInvalid end range: %A%s\n", 16,
                        A_BOLD, szEnd);
+      free(szFrom);
       return;
     }
@@ -1829 +1833 @@
       winMain->wprintf("%CEnd value out of range, history contains %d events.\n",
                        16, nLast);
+      free(szFrom);
       return;
     }
@@ -1839 +1844 @@
   winMain->nLastHistory = nEnd;
   PrintHistory(lHistory, nStart - 1, nEnd - 1, szFrom);
+  free(szFrom);
 }
 

trunk/console/src/console_print.cpp

@@ -126 +126 @@
 {
   static char szMsgStr[16];
-  static char szLastUser[32];
+  static char *szLastUser;
 
   werase(winStatus->Win());
@@ -151 +151 @@
       winMain->sLastContact.nPPID, LOCK_R);
     if (u == NULL)
-      strcpy(szLastUser, "<Removed>");
+      szLastUser = "<Removed>\0";
     else
     {
-      strcpy(szLastUser, u->GetAlias());
+      szLastUser = strdup(u->GetAlias());
       gUserManager.DropUser(u);
     }
   }
   else
-    strcpy(szLastUser, "<None>");
+    szLastUser = "<None>\0";
 
   o = gUserManager.FetchOwner(LOCK_R);