diff options
Diffstat (limited to 'ipc.c')
| -rw-r--r-- | ipc.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -462,7 +462,7 @@ gboolean ipc_child_identify( irc_t *irc ) else if( global.conf->runmode == RUNMODE_DAEMON ) { GSList *l; - irc_t *old; + irc_t *old = NULL; char *to_init[] = { "TAKEOVER", "INIT", NULL }; for( l = irc_connection_list; l; l = l->next ) @@ -476,7 +476,7 @@ gboolean ipc_child_identify( irc_t *irc ) strcmp( irc->password, old->password ) == 0 ) break; } - if( l == NULL || + if( l == NULL || old == NULL || !set_getbool( &irc->b->set, "allow_takeover" ) || !set_getbool( &old->b->set, "allow_takeover" ) ) return FALSE; @@ -523,7 +523,9 @@ static void ipc_command_exec( void *data, char **cmd, const command_t *commands if( g_strcasecmp( commands[i].command, cmd[0] ) == 0 ) { /* There is no typo in this line: */ - for( j = 1; cmd[j]; j ++ ); j --; + for( j = 1; cmd[j]; j ++ ) + ; + j--; if( j < commands[i].required_parameters ) break; |