Thu Jun 14 21:15:31 CEST 2007 Jochen Eisinger <coffee@silcnet.org>

	* Fix off by one error when loading modules.  Affected file is
	  apps/irssi/src/core/modules-load.c

	* Don't delete hilight entry (because it's just a pointer, not a
	  copy).  Affected file is
	  apps/irssi/src/fe-common/silc/fe-silc-messages.c

diff --git a/CHANGES b/CHANGES
index a87492f3ff6ebf63ebb9dedd513a8fb9fabdf609..50d6dfa5cfe269817bd47c9b405c2218cc47ddad 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,12 @@
+Thu Jun 14 21:15:31 CEST 2007  Jochen Eisinger <coffee@silcnet.org>
+
+       * Fix off by one error when loading modules.  Affected file is
+         apps/irssi/src/core/modules-load.c
+
+       * Don't delete hilight entry (because it's just a pointer, not a
+         copy).  Affected file is 
+         apps/irssi/src/fe-common/silc/fe-silc-messages.c
+
 Mon Jun 11 22:10:17 EEST 2007  Pekka Riikonen <priikone@silcnet.org>
 
        * Added __SILC_TOOLKIT_x_x_x macro to all Toolkit distribution

diff --git a/apps/irssi/src/core/modules-load.c b/apps/irssi/src/core/modules-load.c
index 2ae029e845077769b2d16093af72ade6439ac33f..42703fc653a14da643087cf8552b48657598111c 100644 (file)
--- a/apps/irssi/src/core/modules-load.c
+++ b/apps/irssi/src/core/modules-load.c
@@ -97,7 +97,7 @@ static char *module_get_sub(const char *name, const char *root)
            strcmp(name+rootlen, "_core") == 0)
                 return g_strdup("core");
 
-       if (namelen+1 > rootlen && name[namelen-rootlen-1] == '_' &&
+       if (namelen > rootlen && name[namelen-rootlen-1] == '_' &&
            strcmp(name+namelen-rootlen, root) == 0)
                 return g_strndup(name, namelen-rootlen-1);
 

diff --git a/apps/irssi/src/fe-common/silc/fe-silc-messages.c b/apps/irssi/src/fe-common/silc/fe-silc-messages.c
index acded96f8f617c30e1ed19342f40b73b48bb064f..7674d904e4559dbf1467547b32c514a4cc10e062 100644 (file)
--- a/apps/irssi/src/fe-common/silc/fe-silc-messages.c
+++ b/apps/irssi/src/fe-common/silc/fe-silc-messages.c
@@ -120,7 +120,6 @@ static void sig_signed_message_public(SERVER_REC * server, const char *msg,
   }
 
   g_free_not_null(freemsg);
-  g_free_not_null(color);
 }
 
 static void sig_signed_message_own_public(SERVER_REC * server,