Author: jmb Date: Mon Nov 23 17:09:04 2009 New Revision: 9705 URL: http://source.netsurf-browser.org?rev=9705&view=rev Log: Avoid NULL pointer dereference Modified: trunk/libnsfb/src/frontend.c Modified: trunk/libnsfb/src/frontend.c URL: http://source.netsurf-browser.org/trunk/libnsfb/src/frontend.c?rev=9705&a... ============================================================================== --- trunk/libnsfb/src/frontend.c (original) +++ trunk/libnsfb/src/frontend.c Mon Nov 23 17:09:04 2009 @@ -92,22 +92,22 @@ (rtns->input == NULL) ) { free(rtns); rtns = NULL; + } else { + /* The rest may be empty but to avoid the null check every time + * provide default implementations. + */ + if (rtns->defaults == NULL) + rtns->defaults = frontend_defaults; + + if (rtns->claim == NULL) + rtns->claim = frontend_claim; + + if (rtns->release == NULL) + rtns->release = frontend_release; + + if (rtns->cursor == NULL) + rtns->cursor = frontend_cursor; } - - /* The rest may be empty but to avoid the null check every time - * provide default implementations. - */ - if (rtns->defaults == NULL) - rtns->defaults = frontend_defaults; - - if (rtns->claim == NULL) - rtns->claim = frontend_claim; - - if (rtns->release == NULL) - rtns->release = frontend_release; - - if (rtns->cursor == NULL) - rtns->cursor = frontend_cursor; break; }