Added buffer boundary check to avoid potential buffer overflow

Added buffer boundary check to avoid potential buffer overflow #3344