Merge "Fix heap-use-after-free issue flagged by fuzzer test." into main