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

lame bug found by jj

Browse Source
This commit is contained in:
nohar 2005-08-01 11:16:39 +00:00
parent 2c4b77fab0
commit 0e6af5bcf6
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/connection.c
View File

@ -1136,7 +1136,6 @@ static int bip_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
SSL *ssl; SSL *ssl;
connection_t *c; connection_t *c;
X509_OBJECT xobj; X509_OBJECT xobj;
int is_in_store;
int result; int result;
err_cert = X509_STORE_CTX_get_current_cert(ctx); err_cert = X509_STORE_CTX_get_current_cert(ctx);

24
src/irc.c
View File

@ -556,7 +556,7 @@ static char *get_str_elem(char *str, int num)
char *cur = str; char *cur = str;
int index = 0; int index = 0;
while (c = strchr(cur, PASS_SEP)){ while ((c = strchr(cur, PASS_SEP))) {
if (index < num) { if (index < num) {
index++; index++;
cur = c + 1; cur = c + 1;
@ -1367,15 +1367,8 @@ static int irc_mode(struct link_server *server, struct line *line)
if (line->elemc < 3) if (line->elemc < 3)
return ERR_PROTOCOL; return ERR_PROTOCOL;
if (ischannel(line->elemv[1][0])) { /* nick mode change */
channel = hash_get(&server->channels, line->elemv[1]); if (strcmp(line->elemv[1], server->nick) == 0) {
/* we can't get mode message for chans we're not on */
if (!channel)
return ERR_PROTOCOL;
log_mode(LINK(server)->log, line->origin, line->elemv[1],
line->elemv[2], line->elemv + 3,
line->elemc - 3);
} else if (strcmp(line->elemv[1], server->nick) == 0) {
log_mode(LINK(server)->log, line->origin, line->elemv[1], log_mode(LINK(server)->log, line->origin, line->elemv[1],
line->elemv[2], line->elemv + 3, line->elemv[2], line->elemv + 3,
line->elemc - 3); line->elemc - 3);
@ -1383,6 +1376,17 @@ static int irc_mode(struct link_server *server, struct line *line)
return OK_COPY; return OK_COPY;
} }
if (!ischannel(line->elemv[1][0]))
return ERR_PROTOCOL;
/* channel mode change */
channel = hash_get(&server->channels, line->elemv[1]);
/* we can't get mode message for chans we're not on */
if (!channel)
return ERR_PROTOCOL;
log_mode(LINK(server)->log, line->origin, line->elemv[1],
line->elemv[2], line->elemv + 3, line->elemc - 3);
/* /*
* MODE -a+b.. #channel args * MODE -a+b.. #channel args
* ^ ^ * ^ ^