sigtool: properly normalize html files (bb#2764)

ChangeLog

@@ -1,3 +1,7 @@
+Tue May  3 22:52:04 PDT 2011 (tk)
+---------------------------------
+ * sigtool: properly normalize html files (bb#2764)
+
 Tue May  3 16:14:27 PDT 2011 (tk)
 ---------------------------------
  * sigtool/sigtool.c: fix formatting of hash dbs (bb#2765)

libclamav/htmlnorm.c

@@ -625,8 +625,8 @@ static int cli_html_normalise(int fd, m_area_t *m_area, const char *dirname, tag
 	struct entity_conv conv;
 	unsigned char entity_val[HTML_STR_LENGTH+1];
 	size_t entity_val_length = 0;
-	const int dconf_entconv = dconf && dconf->phishing&PHISHING_CONF_ENTCONV;
-	const int dconf_js = dirname && dconf && dconf->doc&DOC_CONF_JSNORM; /* TODO */
+	const int dconf_entconv = dconf ? dconf->phishing&PHISHING_CONF_ENTCONV : 1;
+	const int dconf_js = dirname && (dconf ? dconf->doc&DOC_CONF_JSNORM : 1); /* 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 = NULL, *js_end = NULL;