From 25cacb19c8e19bd715bca93b0e60d430ca739b61 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Thu, 11 Oct 2012 14:21:13 +0100 Subject: Ensure correct error type is returned. --- utils/corestrings.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/utils/corestrings.c b/utils/corestrings.c index 0e2428e19..f2420116c 100644 --- a/utils/corestrings.c +++ b/utils/corestrings.c @@ -416,13 +416,17 @@ nserror corestrings_init(void) SLEN("multipart/form-data"), &corestring_lwc_multipart_form_data); if ((lerror != lwc_error_ok) || - (corestring_lwc_multipart_form_data == NULL)) + (corestring_lwc_multipart_form_data == NULL)) { + error = NSERROR_NOMEM; goto error; + } lerror = lwc_intern_string("text/css", SLEN("text/css"), &corestring_lwc_text_css); - if ((lerror != lwc_error_ok) || (corestring_lwc_text_css == NULL)) + if ((lerror != lwc_error_ok) || (corestring_lwc_text_css == NULL)) { + error = NSERROR_NOMEM; goto error; + } #define CSS_DOM_STRING_INTERN(NAME) \ @@ -482,14 +486,18 @@ nserror corestrings_init(void) exc = dom_string_create_interned((const uint8_t *) "text/javascript", SLEN("text/javascript"), &corestring_dom_text_javascript); - if ((exc != DOM_NO_ERR) || (corestring_dom_text_javascript == NULL)) + if ((exc != DOM_NO_ERR) || (corestring_dom_text_javascript == NULL)) { + error = NSERROR_NOMEM; goto error; + } exc = dom_string_create_interned((const uint8_t *) "http-equiv", SLEN("http-equiv"), &corestring_dom_http_equiv); - if ((exc != DOM_NO_ERR) || (corestring_dom_http_equiv == NULL)) + if ((exc != DOM_NO_ERR) || (corestring_dom_http_equiv == NULL)) { + error = NSERROR_NOMEM; goto error; + } return NSERROR_OK; -- cgit v1.2.3