In _PR_MD_OPEN_DIR, we append \*.* to the directory name,PLUGIN_MODULE_19980708_BASE

but if the directory name ends in a slash or backslash,
we do not append the backslash.
Files changed: ntio.c and w95io.c.

2 files changed, 34 insertions, 4 deletions

diff --git a/pr/src/md/windows/ntio.c b/pr/src/md/windows/ntio.c
index f2938b72..d3640995 100644
--- a/pr/src/md/windows/ntio.c
+++ b/pr/src/md/windows/ntio.c
@@ -2118,9 +2118,24 @@ PRStatus
 _PR_MD_OPEN_DIR(_MDDir *d, const char *name)
 {
     char filename[ MAX_PATH ];
+    int len;
 
-    PR_snprintf(filename, MAX_PATH, "%s%s%s",
-                name, PR_DIRECTORY_SEPARATOR_STR, "*.*");
+    len = strlen(name);
+    /* Need 5 bytes for \*.* and the trailing null byte. */
+    if (len + 5 > MAX_PATH) {
+        PR_SetError(PR_NAME_TOO_LONG_ERROR, 0);
+        return PR_FAILURE;
+    }
+    strcpy(filename, name);
+
+    /*
+     * If 'name' ends in a slash or backslash, do not append
+     * another backslash.
+     */
+    if (filename[len - 1] == '/' || filename[len - 1] == '\\') {
+        len--;
+    }
+    strcpy(&filename[len], "\\*.*");
     FlipSlashes( filename, strlen(filename) );
 
     d->d_hdl = FindFirstFile( filename, &(d->d_entry) );
diff --git a/pr/src/md/windows/w95io.c b/pr/src/md/windows/w95io.c
index 90811721..913d6ef9 100644
--- a/pr/src/md/windows/w95io.c
+++ b/pr/src/md/windows/w95io.c
@@ -349,9 +349,24 @@ PRStatus
 _PR_MD_OPEN_DIR(_MDDir *d, const char *name)
 {
     char filename[ MAX_PATH ];
+    int len;
 
-    PR_snprintf(filename, MAX_PATH, "%s%s%s",
-                name, PR_DIRECTORY_SEPARATOR_STR, "*.*");
+    len = strlen(name);
+    /* Need 5 bytes for \*.* and the trailing null byte. */
+    if (len + 5 > MAX_PATH) {
+        PR_SetError(PR_NAME_TOO_LONG_ERROR, 0);
+        return PR_FAILURE;
+    }
+    strcpy(filename, name);
+
+    /*
+     * If 'name' ends in a slash or backslash, do not append
+     * another backslash.
+     */
+    if (filename[len - 1] == '/' || filename[len - 1] == '\\') {
+        len--;
+    }
+    strcpy(&filename[len], "\\*.*");
     FlipSlashes( filename, strlen(filename) );
 
     d->d_hdl = FindFirstFile( filename, &(d->d_entry) );