From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pierre Habouzit Subject: [PATCH] Fix memory leak in apply_filter. Date: Fri, 05 Oct 2007 10:29:25 +0200 Message-ID: <20071005082925.GG19879@artemis.corp> References: <87wsu2sad0.fsf@gollum.intra.norang.ca> <20071005082026.GE19879@artemis.corp> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: git@vger.kernel.org To: Junio C Hamano , Bernt Hansen X-From: git-owner@vger.kernel.org Fri Oct 05 10:29:36 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1IdiYx-0001l1-40 for gcvg-git-2@gmane.org; Fri, 05 Oct 2007 10:29:35 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753787AbXJEI31 (ORCPT ); Fri, 5 Oct 2007 04:29:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753850AbXJEI31 (ORCPT ); Fri, 5 Oct 2007 04:29:27 -0400 Received: from pan.madism.org ([88.191.52.104]:40406 "EHLO hermes.madism.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753722AbXJEI30 (ORCPT ); Fri, 5 Oct 2007 04:29:26 -0400 Received: from madism.org (beacon-free1.intersec.com [81.57.219.236]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "artemis.madism.org", Issuer "madism.org" (not verified)) by hermes.madism.org (Postfix) with ESMTP id 9482D15E; Fri, 5 Oct 2007 10:29:25 +0200 (CEST) Received: by madism.org (Postfix, from userid 1000) id 40396373; Fri, 5 Oct 2007 10:29:25 +0200 (CEST) Mail-Followup-To: Pierre Habouzit , Junio C Hamano , Bernt Hansen , git@vger.kernel.org Content-Disposition: inline In-Reply-To: <20071005082026.GE19879@artemis.corp> User-Agent: Madmutt/devel (Linux) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Pierre Habouzit --- While we're at it... Here is a stupid memory leak in apply_filter. On top of the previous commit. The same, repost, unsigned doh. convert.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/convert.c b/convert.c index 4664197..d5c197f 100644 --- a/convert.c +++ b/convert.c @@ -293,10 +293,9 @@ static int apply_filter(const char *path, const char *src, size_t len, } if (ret) { - *dst = nbuf; - } else { - strbuf_release(&nbuf); + strbuf_swap(dst, &nbuf); } + strbuf_release(&nbuf); return ret; } -- 1.5.3.4.208.gdcc67-dirty