[ros-diffs] [tkreuzer] 39342: Fix broken and overcomplicated pointer arithmetic