@@ -13287,7 +13287,7 @@ fi

 fi

-if test "$LCHECK" = "no" -a "$enable_check_ut"="yes"; then

+if test "$LCHECK" = "no" -a "$enable_check_ut" = "yes"; then

     echo

     echo "   ERROR!  Check was configured, but not found.  Get it from http://check.sf.net/"

     exit 1

@@ -339,7 +339,7 @@ if test "$enable_check_ut" != "no" ; then

 	],[LCHECK="no"])

 fi

-if test "$LCHECK" = "no" -a "$enable_check_ut"="yes"; then

+if test "$LCHECK" = "no" -a "$enable_check_ut" = "yes"; then

     echo

     echo "   ERROR!  Check was configured, but not found.  Get it from http://check.sf.net/"

     exit 1

@@ -608,7 +608,7 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag

 	const int dconf_js = dirname && dconf && dconf->doc&DOC_CONF_JSNORM; /* TODO */

 	/* dconf for phishing engine sets scanContents, so no need for a flag here */

 	struct parser_state *js_state = NULL;

-	const unsigned char *js_begin, *js_end = NULL;

+	const unsigned char *js_begin = NULL, *js_end = NULL;

 	tag_args.scanContents=0;/* do we need to store the contents of <a></a>?*/

 	if (!m_area) {

@@ -1022,7 +1022,8 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag

 					next_state = HTML_NORM;

 					if (strcmp(tag, "/script") == 0) {

 						in_script = FALSE;

-						js_end = ptr;

+						if(js_state)

+							js_end = ptr;

 						/*don't output newlines in nocomment.html

 						 * html_output_c(file_buff_o2, '\n');*/

 					}

@@ -1584,8 +1585,12 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag

 				js_begin = line;

 			if(!js_end)

 				js_end = ptr;

-			if(js_end > js_begin)

+			if(js_end > js_begin &&

+					CLI_ISCONTAINED(line, 8192, js_begin, 1) &&

+					CLI_ISCONTAINED(line, 8192, js_end, 1)) {

+

 				cli_js_process_buffer(js_state, js_begin, js_end - js_begin);

+			}

 			js_begin = js_end = NULL;

 			if(!in_script) {

 				/*  we found a /script, normalize script now */

@@ -82,6 +82,8 @@ CLAMAV_PRIVATE {

     cli_js_output;

     cli_unescape;

     cli_textbuffer_append_normalize;

+    cli_dconf_init;

+    html_normalise_mem;

   local:

     *;

 };

@@ -11,6 +11,8 @@

 #include <check.h>

 #include "../libclamav/clamav.h"

 #include "../libclamav/others.h"

+#include "../libclamav/dconf.h"

+#include "../libclamav/htmlnorm.h"

 #include "../libclamav/jsparse/js-norm.h"

 #include "../libclamav/jsparse/lexglobal.h"

 #include "../libclamav/jsparse/textbuf.h"

@@ -149,10 +151,41 @@ START_TEST (test_init_parse_destroy)

 }

 END_TEST

+START_TEST (js_begin_end)

+{

+	char buf[16384] = "</script>";

+	size_t p;

+	struct cli_dconf *dconf = cli_dconf_init();

+

+	fail_unless(!!dconf, "failed to init dconf");

+	for(p=strlen(buf); p < 8191; p++) {

+		buf[p++] = 'a';

+		buf[p] = ' ';

+	}

+	strncpy(buf + 8192, " stuff stuff <script language='javascript'> function () {}", 8192);

+	fail_unless(html_normalise_mem(buf, sizeof(buf), NULL, NULL, dconf) == 1, "normalise");

+}

+END_TEST

+

+START_TEST (multiple_scripts)

+{

+	const char buf[] = "</script> stuff"\

+			    "<script language='Javascript'> function foo() {} </script>"\

+			    "<script language='Javascript'> function bar() {} </script>";

+	m_area_t m_area;

+	size_t p;

+	struct cli_dconf *dconf = cli_dconf_init();

+

+	fail_unless(!!dconf, "failed to init dconf");

+	fail_unless(html_normalise_mem(buf, sizeof(buf), NULL, NULL, dconf) == 1, "normalise");

+	/* TODO: test that both had been normalized */

+}

+END_TEST

+

 Suite *test_jsnorm_suite(void)

 {

     Suite *s = suite_create("jsnorm");

-    TCase *tc_jsnorm_gperf, *tc_jsnorm_token, *tc_jsnorm_api;

+    TCase *tc_jsnorm_gperf, *tc_jsnorm_token, *tc_jsnorm_api, *tc_jsnorm_tokenizer, *tc_jsnorm_bugs;

     tc_jsnorm_gperf = tcase_create("jsnorm gperf");

     suite_add_tcase (s, tc_jsnorm_gperf);

     tcase_add_loop_test(tc_jsnorm_gperf, test_keywords, 0, sizeof(kw_test)/sizeof(kw_test[0]));

@@ -171,6 +204,14 @@ Suite *test_jsnorm_suite(void)

     tcase_add_test(tc_jsnorm_api, test_init_destroy);

     tcase_add_test(tc_jsnorm_api, test_init_parse_destroy);

+    tc_jsnorm_tokenizer = tcase_create("jsnorm tokenizer");

+    suite_add_tcase (s, tc_jsnorm_tokenizer);

+

+    tc_jsnorm_bugs = tcase_create("jsnorm bugs");

+    suite_add_tcase (s, tc_jsnorm_bugs);

+    tcase_add_test(tc_jsnorm_bugs, js_begin_end);

+    tcase_add_test(tc_jsnorm_bugs, multiple_scripts);

+

     return s;

 }