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

Fix for null subjects

Browse Source
This commit is contained in:
Andrew Pamment 2016-08-31 16:20:36 +10:00
parent ca3b0bdf60
commit 0f1ffe142c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail_menu.c
View File

@ -260,6 +260,10 @@ struct msg_headers *read_message_headers(int msgconf, int msgarea, struct user_r
} }
JAM_DelSubPacket(jsp); JAM_DelSubPacket(jsp);
if (jamm->subject == NULL) {
jamm->subject = strdup("(No Subject)");
}
if (jmh.Attribute & MSG_PRIVATE) { if (jmh.Attribute & MSG_PRIVATE) {
if (!msg_is_to(user, jamm->to, jamm->daddress, conf.mail_conferences[msgconf]->nettype, conf.mail_conferences[msgconf]->realnames, msgconf) && if (!msg_is_to(user, jamm->to, jamm->daddress, conf.mail_conferences[msgconf]->nettype, conf.mail_conferences[msgconf]->realnames, msgconf) &&
!msg_is_from(user, jamm->from, jamm->oaddress, conf.mail_conferences[msgconf]->nettype, conf.mail_conferences[msgconf]->realnames, msgconf)) { !msg_is_from(user, jamm->from, jamm->oaddress, conf.mail_conferences[msgconf]->nettype, conf.mail_conferences[msgconf]->realnames, msgconf)) {

4
www_msgs.c
View File

@ -329,6 +329,10 @@ char *www_msgs_messageview(struct user_record *user, int conference, int area, i
} }
JAM_DelSubPacket(jsp); JAM_DelSubPacket(jsp);
if (subject == NULL) {
subject = strdup("(No Subject)");
}
if (jmh.Attribute & MSG_PRIVATE) { if (jmh.Attribute & MSG_PRIVATE) {
if (!msg_is_to(user, to, daddress, conf.mail_conferences[conference]->nettype, conf.mail_conferences[conference]->realnames, conference) && if (!msg_is_to(user, to, daddress, conf.mail_conferences[conference]->nettype, conf.mail_conferences[conference]->realnames, conference) &&
!msg_is_from(user, from, oaddress, conf.mail_conferences[conference]->nettype, conf.mail_conferences[conference]->realnames, conference)) { !msg_is_from(user, from, oaddress, conf.mail_conferences[conference]->nettype, conf.mail_conferences[conference]->realnames, conference)) {