lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-08-07 06:23:00 +03:00
Code Activity

Merge pull request #3300 from yiyuaner/dev

Browse Source 
Fix the wrong check for buffer overrun in UTIL_mergeFileNamesTable
This commit is contained in:
Elliot Gorokhovsky
2022-11-02 15:28:02 -04:00
committed by GitHub
parent bd4581c311 361d86998a
commit b1182fe242
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
programs/util.c
View File

@@ -569,7 +569,7 @@ UTIL_mergeFileNamesTable(FileNamesTable* table1, FileNamesTable* table2)
for( idx2=0 ; (idx2 < table2->tableSize) && table2->fileNames[idx2] && (pos < newTotalTableSize) ; ++idx2, ++newTableIdx) { for( idx2=0 ; (idx2 < table2->tableSize) && table2->fileNames[idx2] && (pos < newTotalTableSize) ; ++idx2, ++newTableIdx) {
size_t const curLen = strlen(table2->fileNames[idx2]); size_t const curLen = strlen(table2->fileNames[idx2]);
memcpy(buf+pos, table2->fileNames[idx2], curLen); memcpy(buf+pos, table2->fileNames[idx2], curLen);
assert(newTableIdx <= newTable->tableSize); assert(newTableIdx < newTable->tableSize);
newTable->fileNames[newTableIdx] = buf+pos; newTable->fileNames[newTableIdx] = buf+pos;
pos += curLen+1; pos += curLen+1;
} } } }