Fix Coverity buffer not null terminated issues

[JohnAFernandez]

This should fix the outstanding buffer not null terminated issues on coverity. If there is a better option, especially for the two places that add assertions, please let me know, as c-strings are not my strongest suit.