af/5a25466f1b65c01a67bf5b7e950c60371134c2

   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 D9166431FAF\r
   6         for <notmuch@notmuchmail.org>; Mon, 24 Dec 2012 12:46:45 -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 e5Ekfit9uaFs for <notmuch@notmuchmail.org>;\r
  16         Mon, 24 Dec 2012 12:46:45 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
  18         [18.7.68.36])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 0ED18431FAE\r
  20         for <notmuch@notmuchmail.org>; Mon, 24 Dec 2012 12:46:44 -0800 (PST)\r
  21 X-AuditID: 12074424-b7f4e6d0000004ca-5e-50d8bf349eb8\r
  22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
  23         by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 45.F7.01226.43FB8D05; Mon, 24 Dec 2012 15:46:44 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id qBOKkiA4013446; \r
  27         Mon, 24 Dec 2012 15:46:44 -0500\r
  28 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
  29         (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qBOKke1s028518\r
  32         (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);\r
  33         Mon, 24 Dec 2012 15:46:41 -0500 (EST)\r
  34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)\r
  35         (envelope-from <amdragon@mit.edu>)\r
  36         id 1TnEv2-0008QF-JE; Mon, 24 Dec 2012 15:46:40 -0500\r
  37 From: Austin Clements <amdragon@MIT.EDU>\r
  38 To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
  39 Subject: Re: [PATCH 1/1] lib/message-file.c: use g_malloc () & g_free () in\r
  40         hash table values\r
  41 In-Reply-To: <1356112321-6332-1-git-send-email-tomi.ollila@iki.fi>\r
  42 References: <1356112321-6332-1-git-send-email-tomi.ollila@iki.fi>\r
  43 User-Agent: Notmuch/0.14+236~gf64406d (http://notmuchmail.org) Emacs/23.4.1\r
  44         (i486-pc-linux-gnu)\r
  45 Date: Mon, 24 Dec 2012 15:46:40 -0500\r
  46 Message-ID: <87r4mfkwjz.fsf@awakening.csail.mit.edu>\r
  47 MIME-Version: 1.0\r
  48 Content-Type: text/plain; charset=us-ascii\r
  49 X-Brightmail-Tracker:\r
  50  H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsUixCmqrWuy/0aAwZt5ahbXb85ktnizch6r\r
  51         A5PH4a8LWTyerbrFHMAUxWWTkpqTWZZapG+XwJXxrqmHteC4SMWFjdOYGxhXCXQxcnBICJhI\r
  52         tBzm7GLkBDLFJC7cW8/WxcjFISSwj1Fi3emXUM4GRoklC5YyQjgXmSR+HlvJDOEsYZRYseca\r
  53         G0g/m4CGxLb9yxlBbBEBW4krS06ygqxgBprbPi8EJCwsECvReH8tG0iYU8BJ4vkESZCwkICj\r
  54         RMfkqywgtqhAvMTze9/AbBYBVYn/D94xgdi8QIfeuriLFcIWlDg58wlYDbOAlsSNfy+ZJjAK\r
  55         zkKSmoUktYCRaRWjbEpulW5uYmZOcWqybnFyYl5eapGuuV5uZoleakrpJkZQmLK7qOxgbD6k\r
  56         dIhRgINRiYe3YPKNACHWxLLiytxDjJIcTEqivL67gEJ8SfkplRmJxRnxRaU5qcWHGCU4mJVE\r
  57         eLnXAeV4UxIrq1KL8mFS0hwsSuK811Nu+gsJpCeWpGanphakFsFkZTg4lCR4lfcBNQoWpaan\r
  58         VqRl5pQgpJk4OEGG8wANzwKp4S0uSMwtzkyHyJ9iVJQS5xUASQiAJDJK8+B6YWnkFaM40CvC\r
  59         vG4gVTzAFATX/QpoMBPQ4Fg+sMEliQgpqQbGWPYTK/c2Z9j8277rBoOfybGTZw94Clw38qw+\r
  60         5Bdz4ujVN3PY1s8PYF7UFDaV99d08d+HI6WfXGG8US4r+r370ZN0S/clS+49496SVLNi/m0t\r
  61         y6MZE7ZeLJR88mLxeaEpTmzlc18Exka7y/sE33iyNob3iezPEJGr3V0bfzM5WnBNEr23Seyb\r
  62         phJLcUaioRZzUXEiAO5Esxf+AgAA\r
  63 Cc: tomi.ollila@iki.fi\r
  64 X-BeenThere: notmuch@notmuchmail.org\r
  65 X-Mailman-Version: 2.1.13\r
  66 Precedence: list\r
  67 List-Id: "Use and development of the notmuch mail system."\r
  68         <notmuch.notmuchmail.org>\r
  69 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  71 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  72 List-Post: <mailto:notmuch@notmuchmail.org>\r
  73 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  74 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  75         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  76 X-List-Received-Date: Mon, 24 Dec 2012 20:46:46 -0000\r
  77 \r
  78 LGTM.\r
  79 \r
  80 On Fri, 21 Dec 2012, Tomi Ollila <tomi.ollila@iki.fi> wrote:\r
  81 > The message->headers hash table values get data returned by\r
  82 > g_mime_utils_header_decode_text ().\r
  83 >\r
  84 > The pointer returned by g_mime_utils_header_decode_text is from the\r
  85 > following line in rfc2047_decode_tokens\r
  86 >\r
  87 >         return g_string_free (decoded, FALSE);\r
  88 >\r
  89 > The docs for g_string_free say\r
  90 >\r
  91 >  Frees the memory allocated for the GString. If free_segment is TRUE\r
  92 >  it also frees the character data. If it's FALSE, the caller gains\r
  93 >  ownership of the buffer and must free it after use with g_free().\r
  94 >\r
  95 > The remaining frees and allocations referencing to message->headers hash\r
  96 > values have been changed to use g_free and g_malloc functions.\r
  97 >\r
  98 > This combines and completes the changes started by David Bremner.\r
  99 > ---\r
 100 >\r
 101 > This was meant to be in reply to id:87mwxkptqn.fsf@zancas.localnet\r
 102 > but I fumbled it. ;)\r
 103 >\r
 104 >  lib/message-file.c | 8 ++++----\r
 105 >  1 file changed, 4 insertions(+), 4 deletions(-)\r
 106 >\r
 107 > diff --git a/lib/message-file.c b/lib/message-file.c\r
 108 > index 915aba8..4d9af89 100644\r
 109 > --- a/lib/message-file.c\r
 110 > +++ b/lib/message-file.c\r
 111 > @@ -111,7 +111,7 @@ _notmuch_message_file_open_ctx (void *ctx, const char *filename)\r
 112 >      message->headers = g_hash_table_new_full (strcase_hash,\r
 113 >                                             strcase_equal,\r
 114 >                                             free,\r
 115 > -                                           free);\r
 116 > +                                           g_free);\r
 117 >  \r
 118 >      message->parsing_started = 0;\r
 119 >      message->parsing_finished = 0;\r
 120 > @@ -337,11 +337,11 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,\r
 121 >               /* we need to add the header to those we already collected */\r
 122 >               newhdr = strlen(decoded_value);\r
 123 >               hdrsofar = strlen(header_sofar);\r
 124 > -             combined_header = xmalloc(hdrsofar + newhdr + 2);\r
 125 > +             combined_header = g_malloc(hdrsofar + newhdr + 2);\r
 126 >               strncpy(combined_header,header_sofar,hdrsofar);\r
 127 >               *(combined_header+hdrsofar) = ' ';\r
 128 >               strncpy(combined_header+hdrsofar+1,decoded_value,newhdr+1);\r
 129 > -             free (decoded_value);\r
 130 > +             g_free (decoded_value);\r
 131 >               g_hash_table_insert (message->headers, header, combined_header);\r
 132 >           }\r
 133 >       } else {\r
 134 > @@ -350,7 +350,7 @@ notmuch_message_file_get_header (notmuch_message_file_t *message,\r
 135 >               g_hash_table_insert (message->headers, header, decoded_value);\r
 136 >           } else {\r
 137 >               free (header);\r
 138 > -             free (decoded_value);\r
 139 > +             g_free (decoded_value);\r
 140 >               decoded_value = header_sofar;\r
 141 >           }\r
 142 >       }\r
 143 > -- \r
 144 > 1.8.0\r
 145 >\r
 146 > _______________________________________________\r
 147 > notmuch mailing list\r
 148 > notmuch@notmuchmail.org\r
 149 > http://notmuchmail.org/mailman/listinfo/notmuch\r