From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 1/7] pickaxe: plug diff filespec leak with empty needle
Date: Thu, 06 Oct 2011 18:03:35 +0200 [thread overview]
Message-ID: <4E8DD157.3020808@lsrfire.ath.cx> (raw)
In-Reply-To: <4E8DD065.3040607@lsrfire.ath.cx>
Check first for the unlikely case of an empty needle string and only
then populate the filespec, lest we leak it.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
---
diffcore-pickaxe.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index c3760cf..0835a3b 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -152,10 +152,10 @@ static unsigned int contains(struct diff_filespec *one,
unsigned int cnt;
unsigned long sz;
const char *data;
- if (diff_populate_filespec(one, 0))
- return 0;
if (!len)
return 0;
+ if (diff_populate_filespec(one, 0))
+ return 0;
sz = one->size;
data = one->data;
--
1.7.7
next prev parent reply other threads:[~2011-10-06 16:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-06 15:59 [PATCH 0/7] pickaxe: plug memory leaks, deduplicate code René Scharfe
2011-10-06 16:03 ` René Scharfe [this message]
2011-10-06 16:14 ` [PATCH 2/7] pickaxe: plug regex leak René Scharfe
2011-10-06 16:23 ` [PATCH 3/7] pickaxe: plug regex/kws leak René Scharfe
2011-10-06 16:26 ` [PATCH 4/7] pickaxe: factor out has_changes René Scharfe
2011-10-06 16:50 ` [PATCH 5/7] pickaxe: pass diff_options to contains and has_changes René Scharfe
2011-10-06 16:50 ` [PATCH 6/7] pickaxe: give diff_grep the same signature as has_changes René Scharfe
2011-10-06 16:50 ` [PATCH 7/7] pickaxe: factor out pickaxe René Scharfe
2011-10-07 22:47 ` [PATCH 0/7] pickaxe: plug memory leaks, deduplicate code Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E8DD157.3020808@lsrfire.ath.cx \
--to=rene.scharfe@lsrfire.ath.cx \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).