summaryrefslogtreecommitdiff
path: root/amiga
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2013-09-28 15:37:09 +0100
committerChris Young <chris@unsatisfactorysoftware.co.uk>2013-09-28 15:37:09 +0100
commitbd85c009d3359f85ed5dd8211d797707b29af9cb (patch)
tree7537d19a53c1736158abab23fcff191c870a7b39 /amiga
parent87da43d373466f529ce6c79a50ef06a8c42004a7 (diff)
downloadnetsurf-bd85c009d3359f85ed5dd8211d797707b29af9cb.tar.gz
netsurf-bd85c009d3359f85ed5dd8211d797707b29af9cb.tar.bz2
Ensure the glyph array is NULLed before use, and that we don't attempt to free NULL entries.
Diffstat (limited to 'amiga')
-rw-r--r--amiga/menu.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/amiga/menu.c b/amiga/menu.c
index e75e03791..9d47cbdf4 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -318,6 +318,8 @@ void ami_menu_refresh(struct gui_window_2 *gwin)
static void ami_menu_load_glyphs(struct DrawInfo *dri)
{
+ while(i < NSA_GLYPH_MAX) menu_glyph[i] = NULL;
+
menu_glyph[NSA_GLYPH_SUBMENU] = NewObject(NULL, "sysiclass",
SYSIA_Which, MENUSUB,
SYSIA_DrawInfo, dri,
@@ -340,7 +342,7 @@ void ami_menu_free_glyphs(void)
if(menu_glyphs_loaded == false) return;
while(i < NSA_GLYPH_MAX) {
- DisposeObject(menu_glyph[i]);
+ if(menu_glyph[i]) DisposeObject(menu_glyph[i]);
menu_glyph[i] = NULL;
};