FBZERO: Make sure our offset advances.

Alexis La Goutterequested to merge
cherry-pick-3ff94065-3 into master-2.6

Make sure our offset advances so that we don't infinitely loop. Fixes #16887 (closed).

(cherry picked from commit 3ff94065)

Merge request reports