- possible NULL deref

diff --git a/win32/readdir.c b/win32/readdir.c
index 52ebe2fd092fbdcfbb79586f4d35371c0d536863..9525fc0d6b4995dbcad79e1c93548e83bed91a4f 100644 (file)
--- a/win32/readdir.c
+++ b/win32/readdir.c
@@ -33,6 +33,9 @@ DIR *opendir(const char *dir)
        }
 
        filespec = (char *)malloc(strlen(resolved_path_buff) + 2 + 1);
+       if (filespec == NULL) {
+               return NULL;
+       }
        strcpy(filespec, resolved_path_buff);
        index = strlen(filespec) - 1;
        if (index >= 0 && (filespec[index] == '/' || 
@@ -41,6 +44,9 @@ DIR *opendir(const char *dir)
        strcat(filespec, "\\*");
 
        dp = (DIR *) malloc(sizeof(DIR));
+       if (dp == NULL) {
+               return NULL;
+       }
        dp->offset = 0;
        dp->finished = 0;
 
@@ -140,6 +146,10 @@ int rewinddir(DIR *dp)
        dp->finished = 0;
 
        filespec = (char *)malloc(strlen(dp->dir) + 2 + 1);
+       if (filespec == NULL) {
+               return -1;
+       }
+
        strcpy(filespec, dp->dir);
        index = strlen(filespec) - 1;
        if (index >= 0 && (filespec[index] == '/' ||