Fixed solution 2.5

Fixed checking for buffer overlow