netsurf: branch master updated. release/3.0-569-gbd85c00

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/bd85c009d3359f85ed5dd... ...commit http://git.netsurf-browser.org/netsurf.git/commit/bd85c009d3359f85ed5dd82... ...tree http://git.netsurf-browser.org/netsurf.git/tree/bd85c009d3359f85ed5dd8211... The branch, master has been updated via bd85c009d3359f85ed5dd8211d797707b29af9cb (commit) from 87da43d373466f529ce6c79a50ef06a8c42004a7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=bd85c009d3359f85ed5... commit bd85c009d3359f85ed5dd8211d797707b29af9cb Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Ensure the glyph array is NULLed before use, and that we don't attempt to free NULL entries. diff --git a/amiga/menu.c b/amiga/menu.c index e75e037..9d47cbd 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; }; ----------------------------------------------------------------------- Summary of changes: amiga/menu.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/amiga/menu.c b/amiga/menu.c index e75e037..9d47cbd 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; }; -- NetSurf Browser