From: Erik Faye-Lund <kusmabite@gmail.com>
Date: Tue, 23 Nov 2010 18:38:24 +0000 (+0100)
Subject: msvc: opendir: fix malloc-failure
X-Git-Tag: v1.7.4-rc0~58^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=599b0bf438e387dbaf00dbadcbe41b2a0de90db1;p=git.git

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>
---

diff --git a/compat/msvc.c b/compat/msvc.c
index ac04a4ccb..d6096e4bd 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) {