summaryrefslogtreecommitdiff
path: root/compat/msvc.c
diff options
context:
space:
mode:
authorErik Faye-Lund <kusmabite@gmail.com>2010-11-23 18:38:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-24 00:06:46 (GMT)
commit599b0bf438e387dbaf00dbadcbe41b2a0de90db1 (patch)
tree12678a4503ca7e9e9d0035b7c0ac4474720ea196 /compat/msvc.c
parent89ba4e7c7f71712133d1d3137f811b99ea43dd31 (diff)
downloadgit-599b0bf438e387dbaf00dbadcbe41b2a0de90db1.zip
git-599b0bf438e387dbaf00dbadcbe41b2a0de90db1.tar.gz
git-599b0bf438e387dbaf00dbadcbe41b2a0de90db1.tar.bz2
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>
Diffstat (limited to 'compat/msvc.c')
-rw-r--r--compat/msvc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/compat/msvc.c b/compat/msvc.c
index ac04a4c..d6096e4 100644
--- a/compat/msvc.c
+++ b/compat/msvc.c
@@ -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) {