cef6cf0ac5
Make various string handling locations a little more robust. Signed-off-by: Jeff Squyres <jsquyres@cisco.com>