From 89396e7d2a8c9832ef0d3507a7c5856b2d9229d7 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Thu, 28 May 2009 00:55:04 +0000 Subject: Avoid dereferencing NULL pointer. Tighten up other icon string initialisation, too. svn path=/trunk/netsurf/; revision=7592 --- riscos/401login.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/riscos/401login.c b/riscos/401login.c index ab27ca6ca..ac3ebe35c 100644 --- a/riscos/401login.c +++ b/riscos/401login.c @@ -125,22 +125,22 @@ void ro_gui_401login_open(struct browser_window *bw, const char *host, } /* fill in download window icons */ - dialog_401_template->icons[ICON_401LOGIN_HOST].data.indirected_text.text = - session->host; - dialog_401_template->icons[ICON_401LOGIN_HOST].data.indirected_text.size = - strlen(host) + 1; - dialog_401_template->icons[ICON_401LOGIN_REALM].data.indirected_text.text = - session->realm; - dialog_401_template->icons[ICON_401LOGIN_REALM].data.indirected_text.size = - strlen(realm) + 1; - dialog_401_template->icons[ICON_401LOGIN_USERNAME].data.indirected_text.text = - session->uname; - dialog_401_template->icons[ICON_401LOGIN_USERNAME].data.indirected_text.size = - 256; - dialog_401_template->icons[ICON_401LOGIN_PASSWORD].data.indirected_text.text = - session->pwd; - dialog_401_template->icons[ICON_401LOGIN_PASSWORD].data.indirected_text.size = - 256; + dialog_401_template->icons[ICON_401LOGIN_HOST].data. + indirected_text.text = session->host; + dialog_401_template->icons[ICON_401LOGIN_HOST].data. + indirected_text.size = strlen(session->host) + 1; + dialog_401_template->icons[ICON_401LOGIN_REALM].data. + indirected_text.text = session->realm; + dialog_401_template->icons[ICON_401LOGIN_REALM].data. + indirected_text.size = strlen(session->realm) + 1; + dialog_401_template->icons[ICON_401LOGIN_USERNAME].data. + indirected_text.text = session->uname; + dialog_401_template->icons[ICON_401LOGIN_USERNAME].data. + indirected_text.size = sizeof(session->uname); + dialog_401_template->icons[ICON_401LOGIN_PASSWORD].data. + indirected_text.text = session->pwd; + dialog_401_template->icons[ICON_401LOGIN_PASSWORD].data. + indirected_text.size = sizeof(session->pwd); /* create and open the window */ w = wimp_create_window(dialog_401_template); -- cgit v1.2.3