Fix div-by-zero introduced in #65926 (#66035)

dotnet · Mar 2, 2022 · 96d7d90 · 96d7d90
1 parent a7a4ed9
commit 96d7d90
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/coreclr/vm/eehash.inl b/src/coreclr/vm/eehash.inl
@@ -198,7 +198,7 @@ BOOL EEHashTableBase<KeyType, Helper, bDefaultCopyIsDeep>::Init(DWORD dwNumBucke
     m_pVolatileBucketTable->m_pBuckets++;
     m_pVolatileBucketTable->m_dwNumBuckets = dwNumBuckets;
 #ifdef TARGET_64BIT
-    m_pVolatileBucketTable->m_dwNumBucketsMul = GetFastModMultiplier(dwNumBuckets);
+    m_pVolatileBucketTable->m_dwNumBucketsMul = dwNumBuckets == 0 ? 0 : GetFastModMultiplier(dwNumBuckets);
 #endif
 
     m_Heap = pHeap;
@@ -786,7 +786,7 @@ BOOL EEHashTableBase<KeyType, Helper, bDefaultCopyIsDeep>::GrowHashTable()
     pNewBucketTable->m_pBuckets = pNewBuckets;
     pNewBucketTable->m_dwNumBuckets = dwNewNumBuckets;
 #ifdef TARGET_64BIT
-    pNewBucketTable->m_dwNumBucketsMul = GetFastModMultiplier(dwNewNumBuckets);
+    pNewBucketTable->m_dwNumBucketsMul = dwNewNumBuckets == 0 ? 0 : GetFastModMultiplier(dwNewNumBuckets);
 #endif
 
     // Add old table to the to free list. Note that the SyncClean thing will only

diff --git a/src/coreclr/vm/util.hpp b/src/coreclr/vm/util.hpp
@@ -1017,7 +1017,10 @@ inline UINT64 GetFastModMultiplier(UINT32 divisor)
 
 inline UINT32 FastMod(UINT32 value, UINT32 divisor, UINT64 multiplier)
 {
-    return (UINT32)(((((multiplier * value) >> 32) + 1) * divisor) >> 32);
+    _ASSERTE(divisor <= INT_MAX);
+    UINT32 highbits = (UINT32)(((((multiplier * value) >> 32) + 1) * divisor) >> 32);
+    _ASSERTE(highbits == value % divisor);
+    return highbits;
 }
 #endif