Skip to content

Commit

Permalink
Fix buffer sizes in seen.mod
Browse files Browse the repository at this point in the history 
Found by: michaelortmann
Patch by: michaelortmann
  • Loading branch information
@michaelortmann @vanosg
michaelortmann authored and vanosg committed Dec 11, 2018
1 parent a398566 commit 441ce6d
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions src/mod/seen.mod/seen.c
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ static int msg_seen(char *nick, char *host, struct userrec *u, char *text)
return 0; return 0;
} }
putlog(LOG_CMDS, "*", "(%s!%s) !%s! SEEN %s", nick, host, u->handle, text); putlog(LOG_CMDS, "*", "(%s!%s) !%s! SEEN %s", nick, host, u->handle, text);
sprintf(prefix, "PRIVMSG %s :", nick); snprintf(prefix, sizeof prefix, "PRIVMSG %s :", nick);
do_seen(DP_SERVER, prefix, nick, u->handle, "", text); do_seen(DP_SERVER, prefix, nick, u->handle, "", text);
return 0; return 0;
} }
Expand All @@ -153,7 +153,7 @@ static int dcc_seen(struct userrec *u, int idx, char *par)
static void do_seen(int idx, char *prefix, char *nick, char *hand, static void do_seen(int idx, char *prefix, char *nick, char *hand,
char *channel, char *text) char *channel, char *text)
{ {
char stuff[512], word1[512], word2[512], whotarget[512], object[512], char stuff[512], word1[512], word2[512], whotarget[128], object[128],
whoredirect[512], *oix, *lastonplace = 0; whoredirect[512], *oix, *lastonplace = 0;
struct userrec *urec; struct userrec *urec;
struct chanset_t *chan; struct chanset_t *chan;
Expand Down Expand Up @@ -199,15 +199,15 @@ static void do_seen(int idx, char *prefix, char *nick, char *hand,
m = ismember(chan, object); m = ismember(chan, object);
if (m) { if (m) {
onchan = 1; onchan = 1;
sprintf(stuff, "%s!%s", object, m->userhost); snprintf(stuff, sizeof stuff, "%s!%s", object, m->userhost);
urec = get_user_by_host(stuff); urec = get_user_by_host(stuff);
if (!urec || !egg_strcasecmp(object, urec->handle)) if (!urec || !egg_strcasecmp(object, urec->handle))
break; break;
strcat(whoredirect, object); strcat(whoredirect, object);
strcat(whoredirect, " is "); strcat(whoredirect, " is ");
strcat(whoredirect, urec->handle); strcat(whoredirect, urec->handle);
strcat(whoredirect, ", and "); strcat(whoredirect, ", and ");
strcpy(object, urec->handle); strlcpy(object, urec->handle, sizeof object);
break; break;
} }
chan = chan->next; chan = chan->next;
Expand All @@ -219,9 +219,9 @@ static void do_seen(int idx, char *prefix, char *nick, char *hand,
} }
} }
if (!egg_strcasecmp(word1, "bf") || !egg_strcasecmp(word1, "boyfriend")) { if (!egg_strcasecmp(word1, "bf") || !egg_strcasecmp(word1, "boyfriend")) {
strcpy(whotarget, getxtra(object, "BF")); strlcpy(whotarget, getxtra(object, "BF"), sizeof whotarget);
if (whotarget[0]) { if (whotarget[0]) {
sprintf(whoredirect, "%s boyfriend is %s, and ", snprintf(whoredirect, sizeof whoredirect, "%s boyfriend is %s, and ",
fixnick(object), whotarget); fixnick(object), whotarget);
goto targetcont; goto targetcont;
} }
Expand All @@ -231,9 +231,9 @@ static void do_seen(int idx, char *prefix, char *nick, char *hand,
return; return;
} }
if (!egg_strcasecmp(word1, "gf") || !egg_strcasecmp(word1, "girlfriend")) { if (!egg_strcasecmp(word1, "gf") || !egg_strcasecmp(word1, "girlfriend")) {
strcpy(whotarget, getxtra(object, "GF")); strlcpy(whotarget, getxtra(object, "GF"), sizeof whotarget);
if (whotarget[0]) { if (whotarget[0]) {
sprintf(whoredirect, "%s girlfriend is %s, and ", snprintf(whoredirect, sizeof whoredirect, "%s girlfriend is %s, and ",
fixnick(object), whotarget); fixnick(object), whotarget);
goto targetcont; goto targetcont;
} }
Expand Down Expand Up @@ -263,9 +263,9 @@ static void do_seen(int idx, char *prefix, char *nick, char *hand,
} }
/* "my boyfriend" */ /* "my boyfriend" */
if (!egg_strcasecmp(word1, "boyfriend") || !egg_strcasecmp(word1, "bf")) { if (!egg_strcasecmp(word1, "boyfriend") || !egg_strcasecmp(word1, "bf")) {
strcpy(whotarget, getxtra(hand, "BF")); strlcpy(whotarget, getxtra(hand, "BF"), sizeof whotarget);
if (whotarget[0]) { if (whotarget[0]) {
sprintf(whoredirect, "%s, your boyfriend is %s, and ", nick, whotarget); snprintf(whoredirect, sizeof whoredirect, "%s, your boyfriend is %s, and ", nick, whotarget);
} else { } else {
dprintf(idx, "%sI didn't know you had a boyfriend, %s\n", prefix, nick); dprintf(idx, "%sI didn't know you had a boyfriend, %s\n", prefix, nick);
return; return;
Expand All @@ -274,9 +274,9 @@ static void do_seen(int idx, char *prefix, char *nick, char *hand,
/* "my girlfriend" */ /* "my girlfriend" */
else if (!egg_strcasecmp(word1, "girlfriend") || else if (!egg_strcasecmp(word1, "girlfriend") ||
!egg_strcasecmp(word1, "gf")) { !egg_strcasecmp(word1, "gf")) {
strcpy(whotarget, getxtra(hand, "GF")); strlcpy(whotarget, getxtra(hand, "GF"), sizeof whotarget);
if (whotarget[0]) { if (whotarget[0]) {
sprintf(whoredirect, "%s, your girlfriend is %s, and ", snprintf(whoredirect, sizeof whoredirect, "%s, your girlfriend is %s, and ",
nick, whotarget); nick, whotarget);
} else { } else {
dprintf(idx, "%sI didn't know you had a girlfriend, %s\n", prefix, dprintf(idx, "%sI didn't know you had a girlfriend, %s\n", prefix,
Expand Down Expand Up @@ -325,13 +325,13 @@ static void do_seen(int idx, char *prefix, char *nick, char *hand,
} }
/* Check for keyword match in the internal table */ /* Check for keyword match in the internal table */
else if (match_trigger(word1)) { else if (match_trigger(word1)) {
sprintf(word2, "%s%s\n", prefix, match_trigger(word1)); snprintf(word2, sizeof word2, "%s%s\n", prefix, match_trigger(word1));
dprintf(idx, word2, nick); dprintf(idx, word2, nick);
return; return;
} }
/* Otherwise, make the target to the first word and continue */ /* Otherwise, make the target to the first word and continue */
else else
strcpy(whotarget, word1); strlcpy(whotarget, word1, sizeof whotarget);


targetcont: targetcont:
/* Looking for ones own nick? */ /* Looking for ones own nick? */
Expand All @@ -346,7 +346,7 @@ static void do_seen(int idx, char *prefix, char *nick, char *hand,
m = ismember(chan, whotarget); m = ismember(chan, whotarget);
if (m) { if (m) {
onchan = 1; onchan = 1;
sprintf(word1, "%s!%s", whotarget, m->userhost); snprintf(word1, sizeof word1, "%s!%s", whotarget, m->userhost);
urec = get_user_by_host(word1); urec = get_user_by_host(word1);
if (!urec || !egg_strcasecmp(whotarget, urec->handle)) if (!urec || !egg_strcasecmp(whotarget, urec->handle))
break; break;
Expand All @@ -364,15 +364,15 @@ static void do_seen(int idx, char *prefix, char *nick, char *hand,
while (chan) { while (chan) {
m = chan->channel.member; m = chan->channel.member;
while (m && m->nick[0]) { while (m && m->nick[0]) {
sprintf(word2, "%s!%s", m->nick, m->userhost); snprintf(word2, sizeof word2, "%s!%s", m->nick, m->userhost);
urec = get_user_by_host(word2); urec = get_user_by_host(word2);
if (urec && !egg_strcasecmp(urec->handle, whotarget)) { if (urec && !egg_strcasecmp(urec->handle, whotarget)) {
onchan = 1; onchan = 1;
strcat(whoredirect, whotarget); strcat(whoredirect, whotarget);
strcat(whoredirect, " is "); strcat(whoredirect, " is ");
strcat(whoredirect, m->nick); strcat(whoredirect, m->nick);
strcat(whoredirect, ", and "); strcat(whoredirect, ", and ");
strcpy(whotarget, m->nick); strlcpy(whotarget, m->nick, sizeof whotarget);
break; break;
} }
m = m->next; m = m->next;
Expand Down Expand Up @@ -472,7 +472,7 @@ static void do_seen(int idx, char *prefix, char *nick, char *hand,
work = now - laston; work = now - laston;
if (work >= 86400) { if (work >= 86400) {
tv = work / 86400; tv = work / 86400;
sprintf(word2, "%lu day%s, ", tv, (tv == 1) ? "" : "s"); snprintf(word2, sizeof word2, "%lu day%s, ", tv, (tv == 1) ? "" : "s");
work = work % 86400; work = work % 86400;
} }
if (work >= 3600) { if (work >= 3600) {
Expand All @@ -486,18 +486,18 @@ static void do_seen(int idx, char *prefix, char *nick, char *hand,
(tv == 1) ? "" : "s"); (tv == 1) ? "" : "s");
} }
if (!word2[0] && (work < 60)) { if (!word2[0] && (work < 60)) {
strcpy(word2, "just moments ago!!"); strlcpy(word2, "just moments ago!!", sizeof word2);
} else { } else {
strcpy(word2 + strlen(word2) - 2, " ago."); strcpy(word2 + strlen(word2) - 2, " ago.");
} }
if (lastonplace[0] && (strchr(CHANMETA, lastonplace[0]) != NULL)) if (lastonplace[0] && (strchr(CHANMETA, lastonplace[0]) != NULL))
sprintf(word1, "on IRC channel %s", lastonplace); snprintf(word1, sizeof word1, "on IRC channel %s", lastonplace);
else if (lastonplace[0] == '@') else if (lastonplace[0] == '@')
sprintf(word1, "on %s", lastonplace + 1); snprintf(word1, sizeof word1, "on %s", lastonplace + 1);
else if (lastonplace[0] != 0) else if (lastonplace[0] != 0)
sprintf(word1, "on my %s", lastonplace); snprintf(word1, sizeof word1, "on my %s", lastonplace);
else else
strcpy(word1, "seen"); strlcpy(word1, "seen", sizeof word1);
dprintf(idx, "%s%s%s was last %s %s\n", dprintf(idx, "%s%s%s was last %s %s\n",
prefix, whoredirect, whotarget, word1, word2); prefix, whoredirect, whotarget, word1, word2);
} }
Expand Down

0 comments on commit 441ce6d

Please sign in to comment.