Workaround a bug exposed by the FileCheckify of message-length.c, the caret end

column computation isn't correct and could exceed the line length, which
resulted in a buffer overflow later.
 - Chris, is there a better way for this code to compute the final column used
   by the caret?

llvm-svn: 84475