Cherry pick - 69552

bug fix with off by one pointer check

See merge request !69552 (merged)

(cherry picked from commit 3de6ba47)

eb67be97 bug fix with off by one pointer check

Tagging: @ekajomov, @pscholer