Ubuntu

Comment 6 for bug 723830

I found there one bug with buffer size calculation, but seems like original buffer-overflow warn in strcpy() is false-positive for this case.

This patch fix both problems.