Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 9C83F4196F2 for ; Thu, 4 Nov 2010 20:50:03 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -1.9 X-Spam-Level: X-Spam-Status: No, score=-1.9 tagged_above=-999 required=5 tests=[BAYES_00=-1.9] autolearn=ham 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 ETcH6hVeVSgB for ; Thu, 4 Nov 2010 20:49:53 -0700 (PDT) Received: from mail.mforney.org (mforney.org [65.49.73.30]) by olra.theworths.org (Postfix) with ESMTP id 93E8B4196F0 for ; Thu, 4 Nov 2010 20:49:53 -0700 (PDT) Received: from localhost (hil-100-104.ResHall.Berkeley.EDU [169.229.100.104]) by mail.mforney.org (Postfix) with ESMTPSA id 22FC638028; Thu, 4 Nov 2010 20:52:02 -0700 (PDT) From: Michael Forney To: notmuch@notmuchmail.org Subject: [PATCH] lib: Fix memory leaks in notmuch_message_file_get_header Date: Thu, 4 Nov 2010 20:49:35 -0700 Message-Id: <1288928975-10041-1-git-send-email-mforney@mforney.org> X-Mailer: git-send-email 1.7.2.3 Cc: Michael Forney 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: Fri, 05 Nov 2010 03:50:03 -0000 When decoded_value, header_sofar, and header are unused, they should be freed. --- lib/message-file.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/lib/message-file.c b/lib/message-file.c index 7722832..1d61577 100644 --- a/lib/message-file.c +++ b/lib/message-file.c @@ -341,18 +341,23 @@ 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); + free(header_sofar); g_hash_table_insert (message->headers, header, combined_header); } } else { if (header_sofar == NULL) { /* Only insert if we don't have a value for this header, yet. */ g_hash_table_insert (message->headers, header, decoded_value); + } else { + free(header); + free(decoded_value); } } /* if we found a match we can bail - unless of course we are * collecting all the Received: headers */ if (match && !is_received) - return decoded_value; + return header_sofar == NULL ? decoded_value : header_sofar; } if (message->parsing_finished) { -- 1.7.2.3