bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix redundant memcmp in BLI_array_store, correct assertion

Browse Source 
Assert failed in BLI_array_store_test, failing to compare chunks
caused an unnecessary memcmp call in rare cases.
This commit is contained in:
Campbell Barton 2023-03-28 12:14:08 +11:00
parent 8ac67a798b
commit 55f6c97185
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/blenlib/intern/array_store.c
View File

@ -1323,18 +1323,19 @@ static BChunkList *bchunk_list_from_data_merge(const BArrayInfo *info,
const BChunk *chunk_a = cref->link;
const BTableRef *tref = tref_prev;
do {
/* Not an error, it just isn't expected the links are ever shared. */
BLI_assert(tref->cref != cref);
const BChunk *chunk_b = tref->cref->link;
# ifdef USE_HASH_TABLE_KEY_CACHE
if (key == chunk_b->key)
# endif
{
/* Not an error, it just isn't expected, in the case chunks are shared
* matching chunks should also be skipped to avoid a redundant `memcmp` call. */
BLI_assert(chunk_a != chunk_b);
if (chunk_a->data_len == chunk_b->data_len) {
if (memcmp(chunk_a->data, chunk_b->data, chunk_a->data_len) == 0) {
is_duplicate = true;
break;
if (chunk_a != chunk_b) {
if (chunk_a->data_len == chunk_b->data_len) {
if (memcmp(chunk_a->data, chunk_b->data, chunk_a->data_len) == 0) {
is_duplicate = true;
break;
}
}
}
}