Skip to content

Commit a372936

Browse files
author
Brent Burley
committed
Merge branch 'review-brentb-main' into 'main'
PtexHashMap bug fixes See merge request look/ptex!14
2 parents 0653655 + ca5aa0b commit a372936

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

src/ptex/PtexHashMap.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ class PtexHashMap
163163
getTable(_table, header, entries);
164164

165165
for (uint32_t i = 0; i < header->numEntries; ++i) {
166+
entries[i].key.~Key();
166167
if (entries[i].value) delete entries[i].value;
167168
}
168169
free(_table);
@@ -264,9 +265,14 @@ class PtexHashMap
264265
memsize = sizeof(TableHeader) + sizeof(Entry) * numEntries;
265266
void* table = malloc(memsize);
266267
memset(table, 0, memsize);
267-
TableHeader* header = (TableHeader*) table;
268+
TableHeader* header = new (table) TableHeader;
268269
header->numEntries = numEntries;
269270
header->size = 0;
271+
Entry* entries = (Entry*)((char*)table + sizeof(TableHeader));
272+
for (int32_t i = 0; i < numEntries; ++i)
273+
{
274+
new (&entries[i]) Entry();
275+
}
270276
return table;
271277
}
272278

0 commit comments

Comments
 (0)