From: Erik Faye-Lund Date: Tue, 23 Nov 2010 18:38:24 GMT Subject: [PATCH v2 1/6] msvc: opendir: fix malloc-failure Message-ID: <1290537509-360-2-git-send-email-kusmabite@gmail.com> In-Reply-To: <1290537509-360-1-git-send-email-kusmabite@gmail.com> 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 --- compat/msvc.c | 8 ++++---- 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) { -- 1.7.3.2.493.gc8738