From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id A0E92431FAF for ; Mon, 10 Dec 2012 17:19:58 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YoSjCARDMjmU for ; Mon, 10 Dec 2012 17:19:58 -0800 (PST) Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 227C9431FAE for ; Mon, 10 Dec 2012 17:19:58 -0800 (PST) Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net ([142.167.90.129] helo=zancas.localnet) by tesseract.cs.unb.ca with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1TiEVl-0000XV-0b; Mon, 10 Dec 2012 21:19:53 -0400 Received: from bremner by zancas.localnet with local (Exim 4.80) (envelope-from ) id 1TiEVf-0001kJ-95; Mon, 10 Dec 2012 21:19:47 -0400 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [PATCH] notmuch_message_file_get_header: replace free with g_free Date: Mon, 10 Dec 2012 21:19:00 -0400 Message-Id: <1355188740-6663-1-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.10.4 X-Spam_bar: - Cc: David Bremner X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Dec 2012 01:19:58 -0000 From: David Bremner The pointer returned by g_mime_utils_header_decode_text is from the following line in rfc2047_decode_tokens return g_string_free (decoded, FALSE); The docs for g_string_free say Frees the memory allocated for the GString. If free_segment is TRUE it also frees the character data. If it's FALSE, the caller gains ownership of the buffer and must free it after use with g_free(). --- lib/message-file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/message-file.c b/lib/message-file.c index 915aba8..976769d 100644 --- a/lib/message-file.c +++ b/lib/message-file.c @@ -341,7 +341,7 @@ notmuch_message_file_get_header (notmuch_message_file_t *message, strncpy(combined_header,header_sofar,hdrsofar); *(combined_header+hdrsofar) = ' '; strncpy(combined_header+hdrsofar+1,decoded_value,newhdr+1); - free (decoded_value); + g_free (decoded_value); g_hash_table_insert (message->headers, header, combined_header); } } else { @@ -350,7 +350,7 @@ notmuch_message_file_get_header (notmuch_message_file_t *message, g_hash_table_insert (message->headers, header, decoded_value); } else { free (header); - free (decoded_value); + g_free (decoded_value); decoded_value = header_sofar; } } -- 1.7.10.4