2c/595180ab8b73dec0e1ea4c0f1c12ec911b8fc6

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 955E9431FBC\r
   6         for <notmuch@notmuchmail.org>; Mon,  3 Feb 2014 12:46:25 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id C97kxAQTWejO for <notmuch@notmuchmail.org>;\r
  16         Mon,  3 Feb 2014 12:46:19 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-3.mit.edu (dmz-mailsec-scanner-3.mit.edu\r
  18         [18.9.25.14])\r
  19         (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 3D22C431FAF\r
  22         for <notmuch@notmuchmail.org>; Mon,  3 Feb 2014 12:46:19 -0800 (PST)\r
  23 X-AuditID: 1209190e-f79ee6d000000c40-89-52f0001abacd\r
  24 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
  25         (using TLS with cipher AES256-SHA (256/256 bits))\r
  26         (Client did not present a certificate)\r
  27         by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
  28         id FA.EB.03136.A1000F25; Mon,  3 Feb 2014 15:46:18 -0500 (EST)\r
  29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  30         by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id s13KkGRF023224; \r
  31         Mon, 3 Feb 2014 15:46:17 -0500\r
  32 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
  33         (authenticated bits=0)\r
  34         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  35         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s13KkDYF024333\r
  36         (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);\r
  37         Mon, 3 Feb 2014 15:46:15 -0500\r
  38 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)\r
  39         (envelope-from <amdragon@mit.edu>)\r
  40         id 1WAQPE-0002Qm-Ud; Mon, 03 Feb 2014 15:46:13 -0500\r
  41 Date: Mon, 3 Feb 2014 15:46:12 -0500\r
  42 From: Austin Clements <amdragon@MIT.EDU>\r
  43 To: Jani Nikula <jani@nikula.org>\r
  44 Subject: Re: [PATCH v3 4/6] cli: sanitize the received header before scanning\r
  45         for replies\r
  46 Message-ID: <20140203204611.GL4375@mit.edu>\r
  47 References: <cover.1391456555.git.jani@nikula.org>\r
  48         <df154611af9e23ef443f56c5abb90c8b276b18e7.1391456555.git.jani@nikula.org>\r
  49 MIME-Version: 1.0\r
  50 Content-Type: text/plain; charset=us-ascii\r
  51 Content-Disposition: inline\r
  52 In-Reply-To:\r
  53  <df154611af9e23ef443f56c5abb90c8b276b18e7.1391456555.git.jani@nikula.org>\r
  54 User-Agent: Mutt/1.5.21 (2010-09-15)\r
  55 X-Brightmail-Tracker:\r
  56  H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42IR4hTV1pVi+BBk0LFWwKJpurPF9ZszmR2Y\r
  57         PG7df83u8WzVLeYApigum5TUnMyy1CJ9uwSujOM/OxgLVnBXnGx4ydzAeJ+ji5GTQ0LAROJN\r
  58         fzsrhC0mceHeerYuRi4OIYHZTBKrP/+AcjYwSnzdcAfKOcUk8eH4UyYIZwmjxP9/08D6WQRU\r
  59         JPomrWcEsdkENCS27V8OZosIKEpsPrkfzGYWkJb49ruZCcQWFoiWOPv+NFicV0Bb4s3MPrC4\r
  60         kECdxNXWmywQcUGJkzOfsED0aknc+PcSqIYDbM7yf2AvcAqESWxYOJcZxBYFOmHKyW1sExiF\r
  61         ZiHpnoWkexZC9wJG5lWMsim5Vbq5iZk5xanJusXJiXl5qUW6xnq5mSV6qSmlmxjBYS3Jt4Px\r
  62         60GlQ4wCHIxKPLwde98FCbEmlhVX5h5ilORgUhLlzfnzPkiILyk/pTIjsTgjvqg0J7X4EKME\r
  63         B7OSCK/fJ6Acb0piZVVqUT5MSpqDRUmcN3HGmyAhgfTEktTs1NSC1CKYrAwHh5IEr9x/oEbB\r
  64         otT01Iq0zJwShDQTByfIcB6g4VX/QIYXFyTmFmemQ+RPMSpKifOagzQLgCQySvPgemFp5xWj\r
  65         ONArwrx3Qdp5gCkLrvsV0GAmoMHrXMEGlyQipKQaGCvUnmRbvjOvaNnO5MRSWhm0vUvo19uX\r
  66         4UpBHX8u7feNuna7vfzqbuHZDtqdxzikDuQxFq48n6O35GtihMTCwI7JGu/1RWS35h97O22+\r
  67         cZ/V/i1W1cfOFl6pX3pWafV9xjUV32Ys/Vjiy37+nKy7+MET1mqJHVGCckf77s3d0Ve0NqC1\r
  68         8fZkByWW4oxEQy3mouJEAL2Whm4WAwAA\r
  69 Cc: notmuch@notmuchmail.org\r
  70 X-BeenThere: notmuch@notmuchmail.org\r
  71 X-Mailman-Version: 2.1.13\r
  72 Precedence: list\r
  73 List-Id: "Use and development of the notmuch mail system."\r
  74         <notmuch.notmuchmail.org>\r
  75 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  76         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  77 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  78 List-Post: <mailto:notmuch@notmuchmail.org>\r
  79 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  80 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  81         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  82 X-List-Received-Date: Mon, 03 Feb 2014 20:46:25 -0000\r
  83 \r
  84 Quoth Jani Nikula on Feb 03 at  9:51 pm:\r
  85 > This makes the from guessing agnostic to header folding by spaces or\r
  86 > tabs.\r
  87 > ---\r
  88 >  notmuch-reply.c | 12 ++++++++++--\r
  89 >  1 file changed, 10 insertions(+), 2 deletions(-)\r
  90 > \r
  91 > diff --git a/notmuch-reply.c b/notmuch-reply.c\r
  92 > index 47993d2..3f7021e 100644\r
  93 > --- a/notmuch-reply.c\r
  94 > +++ b/notmuch-reply.c\r
  95 > @@ -21,6 +21,7 @@\r
  96 >   */\r
  97 >  \r
  98 >  #include "notmuch-client.h"\r
  99 > +#include "string-util.h"\r
 100 >  #include "sprinter.h"\r
 101 >  \r
 102 >  static void\r
 103 > @@ -465,14 +466,21 @@ guess_from_in_received_headers (notmuch_config_t *config,\r
 104 >                               notmuch_message_t *message)\r
 105 >  {\r
 106 >      const char *received, *addr;\r
 107 > +    char *sanitized;\r
 108 >  \r
 109 >      received = notmuch_message_get_header (message, "received");\r
 110 >      if (! received)\r
 111 >       return NULL;\r
 112 >  \r
 113 > -    addr = guess_from_in_received_for (config, received);\r
 114 > +    sanitized = sanitize_string (config, received);\r
 115 \r
 116 Did you mean to pass "config" as the talloc context for\r
 117 sanitize_string?  It seems like a better context would be "message" or\r
 118 possibly even NULL, given that you explicitly talloc_free the string.\r
 119 \r
 120 > +    if (! sanitized)\r
 121 > +     return NULL;\r
 122 > +\r
 123 > +    addr = guess_from_in_received_for (config, sanitized);\r
 124 >      if (! addr)\r
 125 > -     addr = guess_from_in_received_by (config, received);\r
 126 > +     addr = guess_from_in_received_by (config, sanitized);\r
 127 > +\r
 128 > +    talloc_free (sanitized);\r
 129 >  \r
 130 >      return addr;\r
 131 >  }\r