More precaution about arbitrary console output

diff --git a/mbox.c b/mbox.c
index ecb0c54..5860abb 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -217,7 +217,6 @@ int inspect_mbox(char *path, char *prefix, off_t size, int opt_flags)
     if (inheader) {
       if (strlen(buf) == 0) {
        inheader = 0;
-       newmail = 1;
 
        if (strlen(from))
          stringcopy (realfrom, realname(from), sizeof(realfrom));
@@ -226,8 +225,10 @@ int inspect_mbox(char *path, char *prefix, off_t size, int opt_flags)
        else
          realfrom[0] = '\0';
 
-       if (realfrom[0] != '\0')
+       if (realfrom[0] != '\0' || subject[0] != '\0') {
          emit (prefix, realfrom, subject, priority, opt_flags);
+         newmail = 1;
+       }
 
 #ifdef FROM_DETECTION
        from_[0] = from[0] = to[0] = subject[0] = '\0';