ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1366 from facebook/fix_strncat

Browse Source 
fixed minor gcc warning
This commit is contained in:
Yann Collet
2018-10-11 14:58:00 -07:00
committed by GitHub
parent 7ee135bd8e 433059bbb2
commit 02e5c03f24
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programs/fileio.c
+4 -3
View File
@@ -1219,7 +1219,8 @@ FIO_determineCompressedName(const char* srcFileName, const char* suffix)
size_t const sfnSize = strlen(srcFileName); size_t const sfnSize = strlen(srcFileName);
size_t const suffixSize = strlen(suffix); size_t const suffixSize = strlen(suffix);
if (dfnbCapacity <= sfnSize+suffixSize+1) { /* resize name buffer */ if (dfnbCapacity <= sfnSize+suffixSize+1) {
/* resize buffer for dstName */
free(dstFileNameBuffer); free(dstFileNameBuffer);
dfnbCapacity = sfnSize + suffixSize + 30; dfnbCapacity = sfnSize + suffixSize + 30;
dstFileNameBuffer = (char*)malloc(dfnbCapacity); dstFileNameBuffer = (char*)malloc(dfnbCapacity);
@@ -1227,8 +1228,8 @@ FIO_determineCompressedName(const char* srcFileName, const char* suffix)
EXM_THROW(30, "zstd: %s", strerror(errno)); EXM_THROW(30, "zstd: %s", strerror(errno));
} } } }
assert(dstFileNameBuffer != NULL); assert(dstFileNameBuffer != NULL);
strncpy(dstFileNameBuffer, srcFileName, sfnSize+1 /* Include null */); memcpy(dstFileNameBuffer, srcFileName, sfnSize);
strncat(dstFileNameBuffer, suffix, suffixSize); memcpy(dstFileNameBuffer+sfnSize, suffix, suffixSize+1 /* Include terminating null */);
return dstFileNameBuffer; return dstFileNameBuffer;
} }