diff options
Diffstat (limited to 'graphics/font.cpp')
| -rw-r--r-- | graphics/font.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/graphics/font.cpp b/graphics/font.cpp index cdf9090625..0c180ee47d 100644 --- a/graphics/font.cpp +++ b/graphics/font.cpp @@ -214,6 +214,8 @@ int bdf_read_header(Common::SeekableReadStream &fp, NewFontData* pf) { char buf[256]; char facename[256]; char copyright[256]; + memset(facename, 0, sizeof(facename)); + memset(copyright, 0, sizeof(copyright)); /* set certain values to errors for later error checking*/ pf->defaultchar = -1; @@ -235,6 +237,7 @@ int bdf_read_header(Common::SeekableReadStream &fp, NewFontData* pf) { warning("Error: bad 'FONT'"); return 0; } + pf->facename = strdup(facename); continue; } @@ -243,6 +246,7 @@ int bdf_read_header(Common::SeekableReadStream &fp, NewFontData* pf) { warning("Error: bad 'COPYRIGHT'"); return 0; } + pf->copyright = strdup(copyright); continue; } @@ -944,7 +948,7 @@ int Font::wordWrapText(const Common::String &str, int maxWidth, Common::Array<Co if (lineWidth > 0) { wrapper.add(line, lineWidth); // Trim left side - while (tmpStr.size() && isspace(tmpStr[0])) { + while (tmpStr.size() && isspace(static_cast<unsigned char>(tmpStr[0]))) { tmpWidth -= getCharWidth(tmpStr[0]); tmpStr.deleteChar(0); } |