Fix mis-merge of upstream fix.

We would accidentally make the string one byte too short.

Submitted by: Orit Moskovich (oritm mellanox.com)