aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2006-06-25 20:25:13 +0200
committerWilmer van der Gaast <wilmer@gaast.net>2006-06-25 20:25:13 +0200
commit6ee9d2d65ec05d3871e69c2b03b860c6bdd509e9 (patch)
treeed2e3297a36cbfa5e75b3cee0564705336d31263
parent88086dbd9002123be39d00c53460f1ec9f2b719a (diff)
Forgot to initialize pass_rc4 (which caused memory management mess when
trying to load a damaged XML-file).
-rw-r--r--root_commands.c2
-rw-r--r--storage_xml.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/root_commands.c b/root_commands.c
index d263bb84..e69b9981 100644
--- a/root_commands.c
+++ b/root_commands.c
@@ -138,7 +138,7 @@ static void cmd_identify( irc_t *irc, char **cmd )
irc_usermsg( irc, "The nick is (probably) not registered" );
break;
case STORAGE_OK:
- irc_usermsg( irc, "Password accepted" );
+ irc_usermsg( irc, "Password accepted, settings and accounts loaded" );
irc_umode_set( irc, "+R", 1 );
break;
case STORAGE_OTHER_ERROR:
diff --git a/storage_xml.c b/storage_xml.c
index 0bbcd99a..7d72c781 100644
--- a/storage_xml.c
+++ b/storage_xml.c
@@ -130,7 +130,7 @@ static void xml_start_element( GMarkupParseContext *ctx, const gchar *element_na
}
else if( g_strcasecmp( element_name, "account" ) == 0 )
{
- char *protocol, *handle, *server, *password, *autoconnect;
+ char *protocol, *handle, *server, *password = NULL, *autoconnect;
char *pass_b64 = NULL, *pass_rc4 = NULL;
int pass_len;
struct prpl *prpl = NULL;