diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2005-06-07 21:58:17 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2005-06-07 21:58:17 +0000 |
| commit | c0fce75798460fd00ae9f84bf4c9613558ee9324 (patch) | |
| tree | bbb2ee0e89304b10afb60ea83f66a729750204dd /riscos | |
| parent | 0bcfdbeb50b2435b848ea1fd50ccc79ba64fd129 (diff) | |
| download | netsurf-c0fce75798460fd00ae9f84bf4c9613558ee9324.tar.gz netsurf-c0fce75798460fd00ae9f84bf4c9613558ee9324.tar.bz2 | |
[project @ 2005-06-07 21:58:17 by jmb]
Fix stupid assertions.
svn path=/import/netsurf/; revision=1745
Diffstat (limited to 'riscos')
| -rw-r--r-- | riscos/menus.c | 11 | ||||
| -rw-r--r-- | riscos/window.c | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/riscos/menus.c b/riscos/menus.c index e15c638d5..42f2d6f01 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -964,8 +964,15 @@ void gui_create_form_select_menu(struct browser_window *bw, wimp_ICON_BG_COLOUR_SHIFT); err = utf8_to_enc(option->text, local_encoding_name(), 0, &text_convert); - /* this should never fail */ - assert(err == UTF8_CONVERT_OK); + if (err != UTF8_CONVERT_OK) { + /* A bad encoding should never happen, + * so assert this */ + assert(err != UTF8_CONVERT_BADENC); + LOG(("utf8_to_enc failed")); + warn_user("NoMemory", 0); + ro_gui_menu_closed(); + return; + } gui_form_select_menu->entries[i].data.indirected_text.text = text_convert; diff --git a/riscos/window.c b/riscos/window.c index 01c7ce8c2..12729853b 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -891,8 +891,12 @@ void gui_window_set_status(struct gui_window *g, const char *text) /* convert text to local encoding */ err = utf8_to_enc(text, local_encoding_name(), 0, &local_text); - /* this should never fail */ - assert(err == UTF8_CONVERT_OK); + if (err != UTF8_CONVERT_OK) { + /* A bad encoding should never happen, so assert this */ + assert(err != UTF8_CONVERT_BADENC); + LOG(("utf8_to_enc failed")); + return; + } ro_gui_set_icon_string(g->toolbar->status_handle, ICON_STATUS_TEXT, local_text); |