From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sun, 5 Apr 2015 18:05:32 +0000 (+0100)
Subject: Fix URL unit test.
X-Git-Tag: 0.9.0~330
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=065d4b113a567567c4c93056d2c04abe877d8f71;p=thirdparty%2Frspamd.git

Fix URL unit test.
---

diff --git a/src/libserver/url.c b/src/libserver/url.c
index 629d9baa11..dff3ea1fc8 100644
--- a/src/libserver/url.c
+++ b/src/libserver/url.c
@@ -904,7 +904,7 @@ rspamd_url_init (struct rspamd_config *cfg)
 		url_scanner->tld_trie = rspamd_trie_create (TRUE);
 		rspamd_url_add_static_matchers (url_scanner->matchers);
 
-		if (cfg->tld_file) {
+		if (cfg != NULL && cfg->tld_file) {
 			rspamd_url_parse_tld_file (cfg->tld_file, url_scanner);
 		}
 		else {
diff --git a/test/lua/unit/url.lua b/test/lua/unit/url.lua
index 9f96430094..dd6f4b7601 100644
--- a/test/lua/unit/url.lua
+++ b/test/lua/unit/url.lua
@@ -38,9 +38,11 @@ context("URL check functions", function()
   int form;  /* URI originated from form */
   int is_phished; /* URI maybe phishing */
   };
+  struct rspamd_config;
   struct rspamd_url* rspamd_url_get_next (void *pool,
     const char *start, char const **pos);
   void * rspamd_mempool_new (unsigned long size);
+  void rspamd_url_init (struct rspamd_config *cfg);
   ]]
   
   test("Extract urls from text", function()
@@ -52,6 +54,8 @@ context("URL check functions", function()
       {"http://user:password@тест2.РФ:18 text", {"тест2.рф", "user"}},
     }
     
+    ffi.C.rspamd_url_init(nil)
+    
     for _,c in ipairs(cases) do
       local res = ffi.C.rspamd_url_get_next(pool, c[1], nil)