bbs/magicka
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for Reply-IDs

Browse Source
This commit is contained in:
Andrew Pamment 2016-03-30 13:46:09 +10:00
parent 527895570f
commit e35d117a60
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mail_menu.c
View File

@ -774,12 +774,12 @@ void read_message(int socket, struct user_record *user, struct msg_headers *msgh
jsf.Buffer = (char *)buffer; jsf.Buffer = (char *)buffer;
JAM_PutSubfield(jsp, &jsf); JAM_PutSubfield(jsp, &jsf);
jmh.MsgIdCRC = JAM_Crc32(buffer, strlen(buffer)); jmh.MsgIdCRC = JAM_Crc32(buffer, strlen(buffer));
if (msgid != NULL) { if (msghs->msgs[mailno]->msgid != NULL) {
sprintf(buffer, "%d:%d/%d.%d %s", conf.mail_conferences[user->cur_mail_conf]->fidoaddr->zone, sprintf(buffer, "%d:%d/%d.%d %s", conf.mail_conferences[user->cur_mail_conf]->fidoaddr->zone,
conf.mail_conferences[user->cur_mail_conf]->fidoaddr->net, conf.mail_conferences[user->cur_mail_conf]->fidoaddr->net,
conf.mail_conferences[user->cur_mail_conf]->fidoaddr->node, conf.mail_conferences[user->cur_mail_conf]->fidoaddr->node,
conf.mail_conferences[user->cur_mail_conf]->fidoaddr->point, conf.mail_conferences[user->cur_mail_conf]->fidoaddr->point,
&msgid[strlen(timestr) - 8]); &msghs->msgs[mailno]->msgid[strlen(timestr) - 8]);
} }
jsf.LoID = JAMSFLD_REPLYID; jsf.LoID = JAMSFLD_REPLYID;
@ -933,6 +933,11 @@ int mail_menu(int socket, struct user_record *user) {
s_putstring(socket, "\r\n\r\nInvalid Address\r\n"); s_putstring(socket, "\r\n\r\nInvalid Address\r\n");
break; break;
} else { } else {
if (from_addr->zone == 0 && from_addr->net == 0 && from_addr->node == 0 && from_addr->point == 0) {
free(from_addr);
s_putstring(socket, "\r\n\r\nInvalid Address\r\n");
break;
}
sprintf(buffer2, "\r\nMailing to %d:%d/%d.%d\r\n", from_addr->zone, from_addr->net, from_addr->node, from_addr->point); sprintf(buffer2, "\r\nMailing to %d:%d/%d.%d\r\n", from_addr->zone, from_addr->net, from_addr->node, from_addr->point);
s_putstring(socket, buffer2); s_putstring(socket, buffer2);
} }
@ -950,6 +955,14 @@ int mail_menu(int socket, struct user_record *user) {
to = strdup(buffer); to = strdup(buffer);
s_putstring(socket, "\r\nSUBJECT: "); s_putstring(socket, "\r\nSUBJECT: ");
s_readstring(socket, buffer, 25); s_readstring(socket, buffer, 25);
if (strlen(buffer) == 0) {
s_putstring(socket, "\r\nAborted!\r\n");
free(to);
if (from_addr != NULL) {
free(from_addr);
}
break;
}
subject = strdup(buffer); subject = strdup(buffer);
// post a message // post a message
@ -1295,6 +1308,11 @@ int mail_menu(int socket, struct user_record *user) {
to = strdup(buffer); to = strdup(buffer);
s_putstring(socket, "\r\nSUBJECT: "); s_putstring(socket, "\r\nSUBJECT: ");
s_readstring(socket, buffer, 25); s_readstring(socket, buffer, 25);
if (strlen(buffer) == 0) {
free(to);
s_putstring(socket, "\r\nAborted\r\n");
break;
}
subject = strdup(buffer); subject = strdup(buffer);
// post a message // post a message