From 23e16e020e40807d1e7e099d06af9b56cb426149 Mon Sep 17 00:00:00 2001 From: John-Mark Bell Date: Sat, 26 Jan 2013 22:04:26 +0000 Subject: Initialise return values in error cases, too: core code is horrifically lax at checking errors from these APIs. --- riscos/font.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'riscos') diff --git a/riscos/font.c b/riscos/font.c index 326cca973..8d4c6d337 100644 --- a/riscos/font.c +++ b/riscos/font.c @@ -255,6 +255,7 @@ bool nsfont_width(const plot_font_style_t *fstyle, else LOG(("rufl_width: 0x%x", code)); /* warn_user("MiscError", "font error"); */ + *width = 0; return false; } @@ -303,6 +304,8 @@ bool nsfont_position_in_string(const plot_font_style_t *fstyle, else LOG(("rufl_x_to_offset: 0x%x", code)); /* warn_user("MiscError", "font error"); */ + *char_offset = 0; + *actual_x = 0; return false; } @@ -355,6 +358,8 @@ bool nsfont_split(const plot_font_style_t *fstyle, else LOG(("rufl_split: 0x%x", code)); /* warn_user("MiscError", "font error"); */ + *char_offset = 0; + *actual_x = 0; return false; } @@ -386,6 +391,8 @@ bool nsfont_split(const plot_font_style_t *fstyle, else LOG(("rufl_width: 0x%x", code)); /* warn_user("MiscError", "font error"); */ + *char_offset = 0; + *actual_x = 0; return false; } -- cgit v1.2.3