diff options
| author | Julien | 2011-06-05 05:50:40 +0800 |
|---|---|---|
| committer | Julien | 2011-06-23 15:11:37 +0800 |
| commit | 8a5bda72cca58314c639432d5ab718a70fd42b90 (patch) | |
| tree | 9b966d694ff38237a6041498335549b06b8fd619 | |
| parent | 367605d774df038166b14044a5f5ce935f244519 (diff) | |
| download | scummvm-rg350-8a5bda72cca58314c639432d5ab718a70fd42b90.tar.gz scummvm-rg350-8a5bda72cca58314c639432d5ab718a70fd42b90.tar.bz2 scummvm-rg350-8a5bda72cca58314c639432d5ab718a70fd42b90.zip | |
BACKENDS/GRAPHICS: Silence non zero-terminated terminated buffers warnings by initializing the buffers to 0
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 1 | ||||
| -rw-r--r-- | graphics/font.cpp | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 3f85b1a564..96d65c5eb2 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -413,6 +413,7 @@ void OSystem_SDL::setupIcon() { for (i = 0; i < ncols; i++) { unsigned char code; char color[32]; + memset(color, 0, sizeof(color)); unsigned int col; if (sscanf(scummvm_icon[1 + i], "%c c %s", &code, color) != 2) { warning("Wrong format of scummvm_icon[%d] (%s)", 1 + i, scummvm_icon[1 + i]); diff --git a/graphics/font.cpp b/graphics/font.cpp index cdf9090625..d254c64264 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; } |