From e39606c411bad57de5891965628f6ac278df42ee Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Sat, 25 Oct 2014 23:06:18 +0100
Subject: make regex wrapper return errors instead of just aborting

---
 utils/url.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'utils/url.c')

diff --git a/utils/url.c b/utils/url.c
index 37fa93967..949478efb 100644
--- a/utils/url.c
+++ b/utils/url.c
@@ -44,10 +44,12 @@ struct url_components_internal {
 regex_t url_re, url_up_re;
 
 /* exported interface documented in utils/url.h */
-void url_init(void)
+nserror url_init(void)
 {
+	nserror ret;
+
 	/* regex from RFC 2396 */
-	regcomp_wrapper(&url_re, "^[[:space:]]*"
+	ret = regcomp_wrapper(&url_re, "^[[:space:]]*"
 #define URL_RE_SCHEME 2
 			"(([a-zA-Z][-a-zA-Z0-9+.]*):)?"
 #define URL_RE_AUTHORITY 4
@@ -59,7 +61,11 @@ void url_init(void)
 #define URL_RE_FRAGMENT 9
 			"(#([^[:space:]]*))?"
 			"[[:space:]]*$", REG_EXTENDED);
-	regcomp_wrapper(&url_up_re,
+	if (ret != NSERROR_OK) {
+		return ret;
+	}
+
+	return regcomp_wrapper(&url_up_re,
 			"/([^/]?|[.][^./]|[^./][.]|[^./][^./]|[^/][^/][^/]+)"
 			"/[.][.](/|$)",
 			REG_EXTENDED);
-- 
cgit v1.2.3