mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

msvc: opendir: fix malloc-failure

Browse Source 
Previsouly, the code checked for malloc-failure after it had accessed
the returned pointer. Move the check a bit earlier to avoid segfault.

Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Erik Faye-Lund
2010-11-23 19:38:24 +01:00
committed by Junio C Hamano
parent 89ba4e7c7f
commit 599b0bf438
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compat/msvc.c
View File

@ -7,16 +7,16 @@ DIR *opendir(const char *name)
{ {
int len; int len;
DIR *p; DIR *p;
p = (DIR*)malloc(sizeof(DIR)); p = malloc(sizeof(DIR));
if (!p)
return NULL;
memset(p, 0, sizeof(DIR)); memset(p, 0, sizeof(DIR));
strncpy(p->dd_name, name, PATH_MAX); strncpy(p->dd_name, name, PATH_MAX);
len = strlen(p->dd_name); len = strlen(p->dd_name);
p->dd_name[len] = '/'; p->dd_name[len] = '/';
p->dd_name[len+1] = '*'; p->dd_name[len+1] = '*';
if (p == NULL)
return NULL;
p->dd_handle = _findfirst(p->dd_name, &p->dd_dta); p->dd_handle = _findfirst(p->dd_name, &p->dd_dta);
if (p->dd_handle == -1) { if (p->dd_handle == -1) {