WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

GCC-8 string fixes 

Fix for the Windows directory search code.
pull/1634/head
John Safranek 2018-06-22 11:36:25 -07:00
parent af89458af0
commit 7053830628
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wolfcrypt/src/wc_port.c
View File

@ -275,7 +275,7 @@ int wc_ReadDirFirst(ReadDirCtx* ctx, const char* path, char** name)
do { do {
if (ctx->FindFileData.dwFileAttributes != FILE_ATTRIBUTE_DIRECTORY) { if (ctx->FindFileData.dwFileAttributes != FILE_ATTRIBUTE_DIRECTORY) {
dnameLen = (int)XSTRLEN(ctx->entry->d_name); dnameLen = (int)XSTRLEN(ctx->FindFileData.cFileName);
if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) { if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) {
return BAD_PATH_ERROR; return BAD_PATH_ERROR;
@ -345,7 +345,7 @@ int wc_ReadDirNext(ReadDirCtx* ctx, const char* path, char** name)
#ifdef USE_WINDOWS_API #ifdef USE_WINDOWS_API
while (FindNextFileA(ctx->hFind, &ctx->FindFileData)) { while (FindNextFileA(ctx->hFind, &ctx->FindFileData)) {
if (ctx->FindFileData.dwFileAttributes != FILE_ATTRIBUTE_DIRECTORY) { if (ctx->FindFileData.dwFileAttributes != FILE_ATTRIBUTE_DIRECTORY) {
dnameLen = (int)XSTRLEN(ctx->entry->d_name); dnameLen = (int)XSTRLEN(ctx->FindFileData.cFileName);
if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) { if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) {
return BAD_PATH_ERROR; return BAD_PATH_ERROR;