Merge pull request #14023 from hrydgard/ubsan-shift32-fix

Attempt to fix #14022
hrydgard · Jan 30, 2021 · d12d890 · d12d890
2 parents 1eeebcc + 58f1905
commit d12d890
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Core/Font/PGF.cpp b/Core/Font/PGF.cpp
@@ -53,8 +53,10 @@ static int getBits(int numBits, const u8 *buf, size_t pos) {
 
  const u8 done = 32 - bitoff;
  const u8 remaining = numBits - done;
- const u32 mask = (1 << remaining) - 1;
- v |= (wordbuf[wordpos + 1] & mask) << done;
+ if (remaining > 0) {
+ const u32 mask = (1 << remaining) - 1;
+ v |= (wordbuf[wordpos + 1] & mask) << done;
+ }
  return v;
  }
 }