90/4662e9426c789195b46ddccba54ba659326c6f

   1 Return-Path: <dmitry.kurochkin@gmail.com>\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 17878429E30\r
   6         for <notmuch@notmuchmail.org>; Wed, 15 Jun 2011 04:12:01 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.799\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id Bx5ufUuB0g7x for <notmuch@notmuchmail.org>;\r
  17         Wed, 15 Jun 2011 04:11:59 -0700 (PDT)\r
  18 Received: from mail-fx0-f53.google.com (mail-fx0-f53.google.com\r
  19         [209.85.161.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id EC5B8429E2C\r
  22         for <notmuch@notmuchmail.org>; Wed, 15 Jun 2011 04:11:56 -0700 (PDT)\r
  23 Received: by mail-fx0-f53.google.com with SMTP id 8so337389fxm.26\r
  24         for <notmuch@notmuchmail.org>; Wed, 15 Jun 2011 04:11:56 -0700 (PDT)\r
  25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
  26         h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer\r
  27         :in-reply-to:references;\r
  28         bh=PAuLW78XBk3bbf/o5yZ2bjSkHsgYekhy4VfBC7BYaew=;\r
  29         b=MKMEpVUjD8AZChPBwBrvy+sJHC1vDVmj59/qoh30V7thNyCKUacIDZQvxrJRA0HkGw\r
  30         3WRcsqQ1sSZ2bbUviabB2w7G/kVi8sViYCn2XnyYZea6KyGfTUXoxG/LcHElaVS4S8qH\r
  31         qmce3kYY3M/fUcspFoyZQAo1Li89+9H0MQo5g=\r
  32 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;\r
  33         h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
  34         b=VW0SzORig0VLd2sn7eiO3ucELY/FVOZcqWXKCr4sK37p/2IAqDNKIBk2emHH6qyi0U\r
  35         MMz3NcGLyoIl2dtQElTElkT3ObLY62XT+6DSMiCDKL5Z92VfAwC5ArCqWB9l9ULkTjSO\r
  36         7HP2ck8BfWNBdM97j02H8eDAKN4aF3FihY33k=\r
  37 Received: by 10.223.127.210 with SMTP id h18mr445302fas.46.1308136316547;\r
  38         Wed, 15 Jun 2011 04:11:56 -0700 (PDT)\r
  39 Received: from localhost ([91.144.186.21])\r
  40         by mx.google.com with ESMTPS id n15sm160960fag.18.2011.06.15.04.11.55\r
  41         (version=TLSv1/SSLv3 cipher=OTHER);\r
  42         Wed, 15 Jun 2011 04:11:55 -0700 (PDT)\r
  43 From: Dmitry Kurochkin <dmitry.kurochkin@gmail.com>\r
  44 To: notmuch@notmuchmail.org\r
  45 Subject: [PATCH 2/3] Fix memory leak in guess_from_received_header().\r
  46 Date: Wed, 15 Jun 2011 15:12:13 +0400\r
  47 Message-Id: <1308136334-9219-2-git-send-email-dmitry.kurochkin@gmail.com>\r
  48 X-Mailer: git-send-email 1.7.5.4\r
  49 In-Reply-To: <1308136334-9219-1-git-send-email-dmitry.kurochkin@gmail.com>\r
  50 References: <1308136334-9219-1-git-send-email-dmitry.kurochkin@gmail.com>\r
  51 X-BeenThere: notmuch@notmuchmail.org\r
  52 X-Mailman-Version: 2.1.13\r
  53 Precedence: list\r
  54 List-Id: "Use and development of the notmuch mail system."\r
  55         <notmuch.notmuchmail.org>\r
  56 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  57         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  58 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  59 List-Post: <mailto:notmuch@notmuchmail.org>\r
  60 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  61 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  62         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  63 X-List-Received-Date: Wed, 15 Jun 2011 11:12:01 -0000\r
  64 \r
  65 Mta variable was not free()d in one case.\r
  66 ---\r
  67  notmuch-reply.c |    4 +++-\r
  68  1 files changed, 3 insertions(+), 1 deletions(-)\r
  69 \r
  70 diff --git a/notmuch-reply.c b/notmuch-reply.c\r
  71 index dab69e6..64f70bf 100644\r
  72 --- a/notmuch-reply.c\r
  73 +++ b/notmuch-reply.c\r
  74 @@ -401,8 +401,10 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message\r
  75             break;\r
  76         mta = xstrdup (by);\r
  77         token = strtok(mta," \t");\r
  78 -       if (token == NULL)\r
  79 +       if (token == NULL) {\r
  80 +           free (mta);\r
  81             break;\r
  82 +       }\r
  83         /* Now extract the last two components of the MTA host name\r
  84          * as domain and tld.\r
  85          */\r
  86 -- \r
  87 1.7.5.4\r
  88 \r