Merge "Fix heap buffer overflow issue flagged by fuzzer test." into main