- The big forward port. I probably broke lots of stuff, so please look over any

[ircu2.10.12-pk.git] / ircd / m_squit.c

diff --git a/ircd/m_squit.c b/ircd/m_squit.c
index b71d28e1b7d61aa2a7809d1caaa431880634b5b7..8611b21da67ff5aa403be095363d18e4a6ff34d4 100644 (file)
--- a/ircd/m_squit.c
+++ b/ircd/m_squit.c
@@ -60,7 +60,7 @@ int ms_squit(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 {
   const char* server = parv[1];
   struct Client *acptr;
-  time_t timestamp;
+  time_t timestamp = 0;
   char *comment = 0;
   
   if (parc < 2) 
@@ -84,19 +84,22 @@ int ms_squit(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   }
   
   /* If they are squitting me, we reverse it */
-  if (IsMe(acptr)) {
+  if (IsMe(acptr))
     acptr = cptr; /* Bugfix by Prefect */
-  }
-       
-  timestamp = atoi(parv[2]);
+
+  if (parc > 2)
+    timestamp = atoi(parv[2]);
+  else
+    protocol_violation(cptr, "SQUIT with no timestamp/reason");
 
   /* If atoi(parv[2]) == 0 we must indeed squit !
    * It will be our neighbour.
    */
-  if ( timestamp != 0 && timestamp != cli_serv(acptr)->timestamp) {
+  if ( timestamp != 0 && timestamp != cli_serv(acptr)->timestamp)
+  {
     protocol_violation(sptr, "Issued SQUIT for %C with wrong timestamp %Tu "
-                      "(%Tu) (ignored)", acptr, timestamp,
-                      cli_serv(acptr)->timestamp);
+                       "(%Tu) (ignored)", acptr, timestamp,
+                       cli_serv(acptr)->timestamp);
     Debug((DEBUG_NOTICE, "Ignoring SQUIT with the wrong timestamp"));
     return 0;
   }