From: Erik Faye-Lund <kusmabite@gmail.com>
To: git@vger.kernel.org
Cc: msysgit@googlegroups.com, j6t@kdbg.org, gitster@pobox.com,
jrnieder@gmail.com
Subject: [PATCH v2 2/6] msvc: opendir: allocate enough memory
Date: Tue, 23 Nov 2010 19:38:25 +0100 [thread overview]
Message-ID: <1290537509-360-3-git-send-email-kusmabite@gmail.com> (raw)
In-Reply-To: <1290537509-360-1-git-send-email-kusmabite@gmail.com>
The defintion of DIR expects the allocating function to extend
dd_name by over-allocating. This is not currently done in our
implementation of opendir. Fix this.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
compat/msvc.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/compat/msvc.c b/compat/msvc.c
index d6096e4..c195365 100644
--- a/compat/msvc.c
+++ b/compat/msvc.c
@@ -5,15 +5,14 @@
DIR *opendir(const char *name)
{
- int len;
+ int len = strlen(name);
DIR *p;
- p = malloc(sizeof(DIR));
+ p = malloc(sizeof(DIR) + len + 2);
if (!p)
return NULL;
- memset(p, 0, sizeof(DIR));
- strncpy(p->dd_name, name, PATH_MAX);
- len = strlen(p->dd_name);
+ memset(p, 0, sizeof(DIR) + len + 2);
+ strcpy(p->dd_name, name);
p->dd_name[len] = '/';
p->dd_name[len+1] = '*';
--
1.7.3.2.493.gc8738
next prev parent reply other threads:[~2010-11-23 18:39 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-23 18:38 [PATCH v2 0/6] win32-dirent Erik Faye-Lund
2010-11-23 18:38 ` [PATCH v2 1/6] msvc: opendir: fix malloc-failure Erik Faye-Lund
2010-11-23 18:38 ` Erik Faye-Lund [this message]
2010-11-26 18:34 ` [PATCH v2 2/6] msvc: opendir: allocate enough memory Junio C Hamano
2010-11-23 18:38 ` [PATCH v2 3/6] msvc: opendir: do not start the search Erik Faye-Lund
2010-11-23 18:38 ` [PATCH v2 4/6] win32: dirent: handle errors Erik Faye-Lund
2010-11-23 18:38 ` [PATCH v2 5/6] msvc: opendir: handle paths ending with a slash Erik Faye-Lund
2010-11-23 19:31 ` René Scharfe
2010-11-23 19:48 ` Erik Faye-Lund
2010-11-23 20:16 ` René Scharfe
2010-11-23 18:38 ` [PATCH v2 6/6] win32: use our own dirent.h Erik Faye-Lund
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1290537509-360-3-git-send-email-kusmabite@gmail.com \
--to=kusmabite@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=jrnieder@gmail.com \
--cc=msysgit@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).