dirent cleanup #47
dirent cleanup #47
Conversation
| DIR * opendir(const char *name) | ||
| { | ||
| /* | ||
| * Open a directory stream on NAME. |
| if (wcscmp(c_file.name, L".") == 0 || wcscmp(c_file.name, L"..") == 0 ) | ||
| continue; | ||
|
|
||
| if ((pdirentry = malloc(sizeof(struct dirent))) == NULL || | ||
| (tmp = utf16_to_utf8(c_file.name)) == NULL) { | ||
| if (pdirentry) | ||
| free(pdirentry); | ||
| errno = ENOMEM; | ||
| return NULL; | ||
| } |
There was a problem hiding this comment.
for line 134: strncpy(pdirentry->d_name, tmp, strlen(tmp) + 1);
Should it be strncpy(pdirentry->d_name, tmp, sizeof(pdirentry->d_name)); in case tmp is longer than size of d_name?
or need to make sure the length of pdirentry->d_name has enough space for tmp.
| swprintf_s(searchstr, MAX_PATH, L"%s\\*.*", wname); | ||
| /* add *.* for Windows _findfirst() search pattern */ | ||
| if (swprintf(searchstr, MAX_PATH, L"%s\\*.*", wname) == -1) { | ||
| /* breached MAX_PATH */ |
There was a problem hiding this comment.
swprintfreturns the number of wide characters stored in buffer, not counting the terminating null wide character. so this comment "breached MAX_PATH" is misleading?
If we are unable to write to searchstr then we will be inside if loop.
| int | ||
| closedir(DIR *dirp) { | ||
| if ( dirp && dirp->hFile) { | ||
| _findclose(dirp->hFile); | ||
| dirp->hFile = 0; | ||
| free (dirp); |
There was a problem hiding this comment.
we have to free(dirp) irrespective of dirp->hFile.. so plz move this out of if loop..
| /* Read a directory entry from DIRP. */ | ||
| struct dirent* | ||
| readdir(void *avp) { | ||
| struct dirent *pdirentry = NULL; |
There was a problem hiding this comment.
plz update the code as I have modified this to static to avoid the memory leaks..
| else if (_wfindnext(dirp->hFile, &c_file) != 0) | ||
| return NULL; | ||
|
|
||
| dirp->first = 0; |
There was a problem hiding this comment.
this will execute everytime even though it is 0 so better to move it inside if loop at line 116.
No description provided.