diff options
Diffstat (limited to 'libgui')
| -rw-r--r-- | libgui/bmp.c | 2 | ||||
| -rw-r--r-- | libgui/gfx.c | 4 | ||||
| -rw-r--r-- | libgui/png.c | 7 | ||||
| -rw-r--r-- | libgui/psf.c | 3 |
4 files changed, 11 insertions, 5 deletions
diff --git a/libgui/bmp.c b/libgui/bmp.c index 3097e99..9fffbf5 100644 --- a/libgui/bmp.c +++ b/libgui/bmp.c @@ -8,7 +8,7 @@ struct bmp *bmp_load(const char *path) { - void *buf = read(path); + void *buf = sread(path); if (!buf) return NULL; diff --git a/libgui/gfx.c b/libgui/gfx.c index 0efedf9..3eb388a 100644 --- a/libgui/gfx.c +++ b/libgui/gfx.c @@ -51,10 +51,10 @@ static void load_font(enum font_type font_type) path = FONT_64_PATH; break; default: - break; + return; } - fonts[font_type] = psf_parse(read(path)); + fonts[font_type] = psf_parse(sread(path)); assert(fonts[font_type]); } diff --git a/libgui/png.c b/libgui/png.c index 55999d9..2db6e4d 100644 --- a/libgui/png.c +++ b/libgui/png.c @@ -1166,15 +1166,17 @@ struct bmp *png_load(const char *path) if (!png) return NULL; - void *buf = read(path); + void *buf = sread(path); if (!png) { SET_ERROR(png, PNG_ENOTFOUND); png_free(png); return NULL; } + struct stat s = { 0 }; + stat(path, &s); png->source.buffer = buf; - png->source.size = stat(path); + png->source.size = s.size; png->source.owning = 1; png_decode(png); @@ -1188,6 +1190,7 @@ struct bmp *png_load(const char *path) bmp->pitch = png->width * (bmp->bpp >> 3); png_free(png); + free(buf); return bmp; } diff --git a/libgui/psf.c b/libgui/psf.c index d6dc9c3..f7271a8 100644 --- a/libgui/psf.c +++ b/libgui/psf.c @@ -25,6 +25,9 @@ int psf_verify(char *data) struct font *psf_parse(char *data) { + if (!data) + return NULL; + int version = psf_verify(data); char *chars; |