Browse Source

msvc: opendir: fix malloc-failure

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>
maint
Erik Faye-Lund 14 years ago committed by Junio C Hamano
parent
commit
599b0bf438
  1. 8
      compat/msvc.c

8
compat/msvc.c

@ -7,16 +7,16 @@ DIR *opendir(const char *name) @@ -7,16 +7,16 @@ DIR *opendir(const char *name)
{
int len;
DIR *p;
p = (DIR*)malloc(sizeof(DIR));
p = malloc(sizeof(DIR));
if (!p)
return NULL;

memset(p, 0, sizeof(DIR));
strncpy(p->dd_name, name, PATH_MAX);
len = strlen(p->dd_name);
p->dd_name[len] = '/';
p->dd_name[len+1] = '*';

if (p == NULL)
return NULL;

p->dd_handle = _findfirst(p->dd_name, &p->dd_dta);

if (p->dd_handle == -1) {

Loading…
Cancel
Save