Fossil SCM
Bail out of the alert_send() routine if the notification system is misconfigured with a blank email-self value.
Commit
4c73b4afb996639652847455a0a70b9a56e3f43fb053450ce38ca30329a3938f
Parent
488af3639e47440…
1 file changed
+1
-1
+1
-1
| --- src/alerts.c | ||
| +++ src/alerts.c | ||
| @@ -805,11 +805,11 @@ | ||
| 805 | 805 | blob_init(&all, 0, 0); |
| 806 | 806 | pOut = &all; |
| 807 | 807 | } |
| 808 | 808 | blob_append(pOut, blob_buffer(pHdr), blob_size(pHdr)); |
| 809 | 809 | if( p->zFrom==0 || p->zFrom[0]==0 ){ |
| 810 | - blob_appendf(pOut, "From: <nobody@invalid>\r\n"); | |
| 810 | + return; /* email-self is not set. Error will be reported separately */ | |
| 811 | 811 | }else if( zFromName ){ |
| 812 | 812 | blob_appendf(pOut, "From: %s <%s@%s>\r\n", |
| 813 | 813 | zFromName, alert_mailbox_name(zFromName), alert_hostname(p->zFrom)); |
| 814 | 814 | blob_appendf(pOut, "X-Fossil-From: <%s>\r\n", p->zFrom); |
| 815 | 815 | }else{ |
| 816 | 816 |
| --- src/alerts.c | |
| +++ src/alerts.c | |
| @@ -805,11 +805,11 @@ | |
| 805 | blob_init(&all, 0, 0); |
| 806 | pOut = &all; |
| 807 | } |
| 808 | blob_append(pOut, blob_buffer(pHdr), blob_size(pHdr)); |
| 809 | if( p->zFrom==0 || p->zFrom[0]==0 ){ |
| 810 | blob_appendf(pOut, "From: <nobody@invalid>\r\n"); |
| 811 | }else if( zFromName ){ |
| 812 | blob_appendf(pOut, "From: %s <%s@%s>\r\n", |
| 813 | zFromName, alert_mailbox_name(zFromName), alert_hostname(p->zFrom)); |
| 814 | blob_appendf(pOut, "X-Fossil-From: <%s>\r\n", p->zFrom); |
| 815 | }else{ |
| 816 |
| --- src/alerts.c | |
| +++ src/alerts.c | |
| @@ -805,11 +805,11 @@ | |
| 805 | blob_init(&all, 0, 0); |
| 806 | pOut = &all; |
| 807 | } |
| 808 | blob_append(pOut, blob_buffer(pHdr), blob_size(pHdr)); |
| 809 | if( p->zFrom==0 || p->zFrom[0]==0 ){ |
| 810 | return; /* email-self is not set. Error will be reported separately */ |
| 811 | }else if( zFromName ){ |
| 812 | blob_appendf(pOut, "From: %s <%s@%s>\r\n", |
| 813 | zFromName, alert_mailbox_name(zFromName), alert_hostname(p->zFrom)); |
| 814 | blob_appendf(pOut, "X-Fossil-From: <%s>\r\n", p->zFrom); |
| 815 | }else{ |
| 816 |