Merge pull request #1282 from TheBlueMatt/2022-01-fuzz-overflow