CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_11_03
Commit time: 2002-11-30 00:02:34 UTC
Modified files:
Tag: u2_10_11_03
ChangeLog ircd/ircd_alloc.c ircd/m_join.c
Log message:
Author: [EMAIL PROTECTED] / Isomer <[EMAIL PROTECTED]>
Log message:
Humblest thanks to splidge for finding the frobulator bug.
Made the protocol violation messages for m_join a bit more sane
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.125.2.26 ircu2.10/ChangeLog:1.290.2.125.2.27
--- ircu2.10/ChangeLog:1.290.2.125.2.26 Tue Nov 26 20:30:49 2002
+++ ircu2.10/ChangeLog Fri Nov 29 16:02:22 2002
@@ -1,3 +1,9 @@
+2002-11-30 <[EMAIL PROTECTED]>
+ * ircd/ircd_alloc.h: Patched frobulator bug overwriting too much
+
+2002-11-26 Perry Lorier <[EMAIL PROTECTED]>
+ * ircd/m_join.c: Update messages
+
2002-11-27 Andrew Miller <[EMAIL PROTECTED]>
* ircd/channel.c: Don't access memory after it is freed.
* include/patchlevel.h: Bump patchlevel again to stop confusion.
Index: ircu2.10/ircd/ircd_alloc.c
diff -u ircu2.10/ircd/ircd_alloc.c:1.3.2.1.8.2 ircu2.10/ircd/ircd_alloc.c:1.3.2.1.8.3
--- ircu2.10/ircd/ircd_alloc.c:1.3.2.1.8.2 Mon Nov 25 03:03:21 2002
+++ ircu2.10/ircd/ircd_alloc.c Fri Nov 29 16:02:24 2002
@@ -19,7 +19,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: ircd_alloc.c,v 1.3.2.1.8.2 2002/11/25 11:03:21 isomer Exp $
+ * $Id: ircd_alloc.c,v 1.3.2.1.8.3 2002/11/30 00:02:24 isomer Exp $
*/
#include "config.h"
@@ -100,7 +100,7 @@
#ifdef FROBONFREE
size_t old_size = ((size_t*)x)[-1];
if (old_size > size)
- memfrob(((char*)x) + size + sizeof(size_t), old_size - size);
+ memfrob(((char*)x) + size, old_size - size);
x = realloc(((size_t*)x) - 1, size + sizeof(size_t));
#else
x = realloc(x, size);
@@ -110,7 +110,7 @@
/* Both are needed in all cases to work with realloc... */
#if defined(FROBONMALLOC) && defined(FROBONFREE)
if (old_size < size)
- memfrob(((char*)x) + old_size + sizeof(size_t), size - old_size);
+ memfrob(((char*)x) + old_size, size - old_size);
#endif
#ifdef FROBONFREE
*(size_t*)x = size;
Index: ircu2.10/ircd/m_join.c
diff -u ircu2.10/ircd/m_join.c:1.16.2.2.2.5 ircu2.10/ircd/m_join.c:1.16.2.2.2.6
--- ircu2.10/ircd/m_join.c:1.16.2.2.2.5 Sat Nov 23 11:05:08 2002
+++ ircu2.10/ircd/m_join.c Fri Nov 29 16:02:24 2002
@@ -20,7 +20,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: m_join.c,v 1.16.2.2.2.5 2002/11/23 19:05:08 klmitch Exp $
+ * $Id: m_join.c,v 1.16.2.2.2.6 2002/11/30 00:02:24 isomer Exp $
*/
/*
@@ -315,7 +315,7 @@
char *name;
if (IsServer(sptr)) {
- return protocol_violation(sptr,
+ return protocol_violation(cptr,
"%s tried to JOIN %s, duh!",
cli_name(sptr),
(parc < 2 || *parv[1] == '\0') ? "a channel":parv[1]
@@ -339,7 +339,7 @@
continue;
if (IsLocalChannel(name) || !IsChannelName(name)) {
- protocol_violation(sptr,"%s tried to join %s",cli_name(cptr),name);
+ protocol_violation(cptr,"%s tried to join %s",cli_name(sptr),name);
continue;
}
----------------------- End of diff -----------------------
