Преглед изворни кода

* Port [3363] to 1.2.14
* Fix segfault in cmd_channel during splits.



svn: 3364

Bryan Drewery пре 19 година
родитељ
комит
d9a42317d8
2 измењених фајлова са 3 додато и 2 уклоњено
  1. 1 0
      doc/UPDATES
  2. 2 2
      src/mod/irc.mod/cmdsirc.c

+ 1 - 0
doc/UPDATES

@@ -37,6 +37,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Add chanset 'flood-exempt' to exempt ops/voices from flood controls (see 'help chaninfo')
 * Add chanset 'flood-lock-time' to control how long to keep the channel locked during drone floods.
 * chanset flood-join now also counts PARTs as flooding.
+* Fix segfault in cmd_channel during splits.
 
 1.2.13 - http://wraith.shatow.net/milestone/1.2.13
 * Fix cmd_chanset accepting invalid flags

+ 2 - 2
src/mod/irc.mod/cmdsirc.c

@@ -1396,9 +1396,9 @@ static void cmd_channel(int idx, char *par)
 
       if (chan_issplit(m)) {
         egg_snprintf(format, sizeof format, 
-			"%%c%%c%%-%us %%-%us   %%d %%s %%c     <- netsplit, %%lus\n", 
+			"%%c%%c%%-%us %%-%us %%s %%c     <- netsplit, %%lus\n", 
 			maxnicklen, maxhandlen);
-	dprintf(idx, format, chanflag[0],chanflag[1], m->nick, handle, s, m->hops, atrflag,
+	dprintf(idx, format, chanflag[0],chanflag[1], m->nick, handle, s, atrflag,
 		now - (m->split));
       } else if (!rfc_casecmp(m->nick, botname)) {
         egg_snprintf(format, sizeof format,