Fix buffer overrun caused by not updating a string length after address expansion.