Thread (11 messages) flat view 11 messages, 3 authors, 2016-06-15
STALE3735d

Revision v2 of 2 in this series.

Revisions (2)
  1. rfc [diff vs current]
  2. v2 current

[PATCH v2 2/6] msvc: opendir: allocate enough memory

From: Erik Faye-Lund <hidden>
Date: 2016-06-15 22:50:05
Subsystem: the rest · Maintainer: Linus Torvalds

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 <redacted>
---
 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help