undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pickaxe: plug diff filespec leak with empty needle

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2011-10-06 18:03:35 +02:00 committed by Junio C Hamano
parent 703f05ad58
commit 05ac978495
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diffcore-pickaxe.c
View File

@ -152,10 +152,10 @@ static unsigned int contains(struct diff_filespec *one,
unsigned int cnt; unsigned int cnt;
unsigned long sz; unsigned long sz;
const char *data; const char *data;
if (diff_populate_filespec(one, 0))
return 0;
if (!len) if (!len)
return 0; return 0;
if (diff_populate_filespec(one, 0))
return 0;
sz = one->size; sz = one->size;
data = one->data; data = one->data;