Merge "Fix heap-buffer-overflow detected by ASAN."