wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

GCC-8 string fixes

Browse Source 
1. Found one more case where a string is copied, potentially without the null. In wc_ports w.r.t. directory and file names.
This commit is contained in:
John Safranek
2018-07-31 13:50:33 -07:00
parent 7053830628
commit f5b3de6b54
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wolfcrypt/src/wc_port.c
View File

@ -280,7 +280,7 @@ int wc_ReadDirFirst(ReadDirCtx* ctx, const char* path, char** name)
if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) { if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) {
return BAD_PATH_ERROR; return BAD_PATH_ERROR;
} }
XSTRNCPY(ctx->name, path, MAX_FILENAME_SZ); XSTRNCPY(ctx->name, path, pathLen + 1);
ctx->name[pathLen] = '\\'; ctx->name[pathLen] = '\\';
XSTRNCPY(ctx->name + pathLen + 1, XSTRNCPY(ctx->name + pathLen + 1,
ctx->FindFileData.cFileName, ctx->FindFileData.cFileName,
@ -304,7 +304,7 @@ int wc_ReadDirFirst(ReadDirCtx* ctx, const char* path, char** name)
ret = BAD_PATH_ERROR; ret = BAD_PATH_ERROR;
break; break;
} }
XSTRNCPY(ctx->name, path, MAX_FILENAME_SZ); XSTRNCPY(ctx->name, path, pathLen + 1);
ctx->name[pathLen] = '/'; ctx->name[pathLen] = '/';
XSTRNCPY(ctx->name + pathLen + 1, XSTRNCPY(ctx->name + pathLen + 1,
ctx->entry->d_name, MAX_FILENAME_SZ - pathLen - 1); ctx->entry->d_name, MAX_FILENAME_SZ - pathLen - 1);
@ -350,7 +350,7 @@ int wc_ReadDirNext(ReadDirCtx* ctx, const char* path, char** name)
if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) { if (pathLen + dnameLen + 2 > MAX_FILENAME_SZ) {
return BAD_PATH_ERROR; return BAD_PATH_ERROR;
} }
XSTRNCPY(ctx->name, path, MAX_FILENAME_SZ); XSTRNCPY(ctx->name, path, pathLen + 1);
ctx->name[pathLen] = '\\'; ctx->name[pathLen] = '\\';
XSTRNCPY(ctx->name + pathLen + 1, XSTRNCPY(ctx->name + pathLen + 1,
ctx->FindFileData.cFileName, ctx->FindFileData.cFileName,
@ -368,7 +368,7 @@ int wc_ReadDirNext(ReadDirCtx* ctx, const char* path, char** name)
ret = BAD_PATH_ERROR; ret = BAD_PATH_ERROR;
break; break;
} }
XSTRNCPY(ctx->name, path, MAX_FILENAME_SZ); XSTRNCPY(ctx->name, path, pathLen + 1);
ctx->name[pathLen] = '/'; ctx->name[pathLen] = '/';
XSTRNCPY(ctx->name + pathLen + 1, XSTRNCPY(ctx->name + pathLen + 1,
ctx->entry->d_name, MAX_FILENAME_SZ - pathLen - 1); ctx->entry->d_name, MAX_FILENAME_SZ - pathLen - 1);