Better checking for reading over buffer boundaries
(Partial cherry picked from commit 535e97dbab8cf34bb1e487f0f0f169a04eb9921f)
2 files changed