Merge "Fix an overflow found by ASAN."