Kyoshiro/bip
1
0
Fork 0
forked from bip/bip
Code Pull Requests Activity

Null deref fixes when fetching info.

Browse Source
This commit is contained in:
Arnaud Cornet 2008-01-05 23:25:24 +01:00
parent f96751cfb9
commit c5d1f537e4
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bip.c
View File

@ -1441,6 +1441,8 @@ void adm_list_all_connections(struct link_client *ic)
bip_notify(ic, "-- End of All connections"); bip_notify(ic, "-- End of All connections");
} }
#define STRORNULL(s) ((s) == NULL ? "unset" : (s))
void adm_info_user(struct link_client *ic, char *name) void adm_info_user(struct link_client *ic, char *name)
{ {
struct user *u; struct user *u;
@ -1454,13 +1456,8 @@ void adm_info_user(struct link_client *ic, char *name)
return; return;
} }
//t_written += snprintf(buf + t_written, RET_STR_LEN - t_written, ""); t_written += snprintf(buf + t_written, RET_STR_LEN - t_written,
//buf[RET_STR_LEN] = 0; "user: %s", u->name);
//bip_notify(ic, buf);
//t_written = 0;
t_written += snprintf(buf + t_written, RET_STR_LEN - t_written, "user: %s",
u->name);
if (t_written >= RET_STR_LEN) if (t_written >= RET_STR_LEN)
goto noroom; goto noroom;
if (u->admin) { if (u->admin) {
@ -1477,10 +1474,12 @@ noroom:
#ifdef HAVE_LIBSSL #ifdef HAVE_LIBSSL
bip_notify(ic, "SSL check mode '%s', stored into '%s'", bip_notify(ic, "SSL check mode '%s', stored into '%s'",
checkmode2text(u->ssl_check_mode), u->ssl_check_store); checkmode2text(u->ssl_check_mode),
STRORNULL(u->ssl_check_store));
#endif #endif
bip_notify(ic, "Defaults nick: %s, user: %s, realname: %s", bip_notify(ic, "Defaults nick: %s, user: %s, realname: %s",
u->default_nick, u->default_username, u->default_realname); STRORNULL(u->default_nick), STRORNULL(u->default_username),
STRORNULL(u->default_realname));
if (u->backlog) { if (u->backlog) {
bip_notify(ic, "Backlog enabled, lines: %d, no timestamp: %s," bip_notify(ic, "Backlog enabled, lines: %d, no timestamp: %s,"
" messages only: %s", u->backlog_lines, " messages only: %s", u->backlog_lines,
@ -1922,7 +1921,7 @@ void adm_bip_help(struct link_client *ic, int admin, char *subhelp)
bip_notify(ic, " Please note that changes to 'user' or " bip_notify(ic, " Please note that changes to 'user' or "
"'realname' will not be applied without a JUMP."); "'realname' will not be applied without a JUMP.");
} else if (admin && strcasecmp(subhelp, "INFO") == 0) { } else if (admin && strcasecmp(subhelp, "INFO") == 0) {
bip_notify(ic, "/BIP INFO <user> (admin only) :"); bip_notify(ic, "/BIP INFO USER <user> (admin only) :");
bip_notify(ic, " Show <user>'s current configuration."); bip_notify(ic, " Show <user>'s current configuration.");
bip_notify(ic, " That means it may be different from the " bip_notify(ic, " That means it may be different from the "
"configuration stored in bip.conf"); "configuration stored in bip.conf");

8
src/util.c
View File

@ -104,14 +104,6 @@ char *checkmode2text(int v)
} }
#endif #endif
char *bool2text(int v)
{
if (v)
return "true";
else
return "false";
}
extern FILE *conf_global_log_file; extern FILE *conf_global_log_file;
void _mylog(int level, char *fmt, va_list ap) void _mylog(int level, char *fmt, va_list ap)

2
src/util.h
View File

@ -123,6 +123,6 @@ char *hrtime(time_t t);
#ifdef HAVE_LIBSSL #ifdef HAVE_LIBSSL
char *checkmode2text(int v); char *checkmode2text(int v);
#endif #endif
char *bool2text(int v); #define bool2text(v) ((v) ? "true" : "false")
#endif #endif