[3.0] Fix SVACE issue - prevent buffer overflow