Fixed #6361 (crash: CheckBufferOverrun)