--- gftp-2.0.18/lib/fsplib/fsplib.h.sec	2008-01-21 16:19:57.000000000 -0500
+++ gftp-2.0.18/lib/fsplib/fsplib.h	2008-01-21 16:21:24.000000000 -0500
@@ -1,6 +1,9 @@
 #ifndef _FSPLIB_H
 #define _FSPLIB_H 1
 #include <time.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <stddef.h>
 /* The FSP v2 protocol support library - public interface */
 
 /*
@@ -138,6 +141,11 @@ typedef struct FSP_FILE {
 		      unsigned int pos;          /* position of next packet */
 } FSP_FILE;
 
+typedef union dirent_workaround {
+    struct dirent dirent;
+    char fill[offsetof (struct dirent, d_name) + MAXNAMLEN + 1];
+} dirent_workaround;
+
 /* function prototypes */
 
 /* session management */
--- gftp-2.0.18/lib/fsplib/fsplib.c.sec	2008-01-21 16:08:59.000000000 -0500
+++ gftp-2.0.18/lib/fsplib/fsplib.c	2008-01-21 16:19:49.000000000 -0500
@@ -612,9 +612,9 @@ int fsp_readdir_r(FSP_DIR *dir,struct di
     entry->d_reclen = fentry.reclen;
     strncpy(entry->d_name,fentry.name,MAXNAMLEN);
 
-    if (fentry.namlen > MAXNAMLEN)
+    if (fentry.namlen >= MAXNAMLEN)
     {
-	entry->d_name[MAXNAMLEN + 1 ] = '\0';
+	entry->d_name[MAXNAMLEN] = '\0';
 #ifdef HAVE_NAMLEN
 	entry->d_namlen = MAXNAMLEN;
     } else
@@ -680,9 +680,19 @@ int fsp_readdir_native(FSP_DIR *dir,FSP_
        /* skip file date and file size */
        dir->dirpos += 9;
        /* read file name */
-       entry->name[255 + 1] = '\0';
-       strncpy(entry->name,(char *)( dir->data + dir->dirpos ),MAXNAMLEN);
+       entry->name[255] = '\0';
+       strncpy(entry->name,(char *)( dir->data + dir->dirpos ),255);
+       /* check for ASCIIZ encoded filename */
+       if (memchr(dir->data + dir->dirpos,0,dir->datasize - dir->dirpos) != NULL)
+       {
        namelen = strlen( (char *) dir->data+dir->dirpos);
+       }
+       else
+       {
+           /* \0 terminator not found at end of filename */
+           *result = NULL;
+           return 0;
+       }
        /* skip over file name */
        dir->dirpos += namelen +1;
 
@@ -709,12 +719,12 @@ int fsp_readdir_native(FSP_DIR *dir,FSP_
 
 struct dirent * fsp_readdir(FSP_DIR *dirp)
 {
-    static struct dirent entry;
+    static dirent_workaround entry;
     struct dirent *result;
     
     
     if (dirp == NULL) return NULL;
-    if ( fsp_readdir_r(dirp,&entry,&result) )
+    if ( fsp_readdir_r(dirp,&entry.dirent,&result) )
         return NULL;
     else
         return result;