102c102
< prng32(offset, LG_CKH_BUCKET_CELLS, ckh->prng_state, CKH_A, CKH_C);
---
> offset = (unsigned)prng_lg_range(&ckh->prng_state, LG_CKH_BUCKET_CELLS);
144c144,145
< prng32(i, LG_CKH_BUCKET_CELLS, ckh->prng_state, CKH_A, CKH_C);
---
> i = (unsigned)prng_lg_range(&ckh->prng_state,
> LG_CKH_BUCKET_CELLS);
250,251c251
< size_t lg_curcells;
< unsigned lg_prevbuckets;
---
> unsigned lg_prevbuckets, lg_curcells;
269c269
< if (usize == 0) {
---
> if (unlikely(usize == 0 || usize > HUGE_MAXCLASS)) {
286c286
< idalloctm(tsd, tab, tcache_get(tsd, false), true);
---
> idalloctm(tsd, tab, tcache_get(tsd, false), true, true);
291c291
< idalloctm(tsd, ckh->tab, tcache_get(tsd, false), true);
---
> idalloctm(tsd, ckh->tab, tcache_get(tsd, false), true, true);
305,306c305,306
< size_t lg_curcells, usize;
< unsigned lg_prevbuckets;
---
> size_t usize;
> unsigned lg_prevbuckets, lg_curcells;
315c315
< if (usize == 0)
---
> if (unlikely(usize == 0 || usize > HUGE_MAXCLASS))
333c333
< idalloctm(tsd, tab, tcache_get(tsd, false), true);
---
> idalloctm(tsd, tab, tcache_get(tsd, false), true, true);
341c341
< idalloctm(tsd, ckh->tab, tcache_get(tsd, false), true);
---
> idalloctm(tsd, ckh->tab, tcache_get(tsd, false), true, true);
390c390
< if (usize == 0) {
---
> if (unlikely(usize == 0 || usize > HUGE_MAXCLASS)) {
424c424
< idalloctm(tsd, ckh->tab, tcache_get(tsd, false), true);
---
> idalloctm(tsd, ckh->tab, tcache_get(tsd, false), true, true);