From 1f95d81c17f6fa33df29c3bfb881307e369c7806 Mon Sep 17 00:00:00 2001 From: Tomasz Kojm Date: Tue, 3 May 2011 22:52:51 -0700 Subject: [PATCH] sigtool: properly normalize html files (bb#2764) --- ChangeLog | 4 ++++ libclamav/htmlnorm.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b5e6a2ea..639e35575 100644 --- a/ChangeLog +++ b/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) diff --git a/libclamav/htmlnorm.c b/libclamav/htmlnorm.c index 25886984a..2b35cb571 100644 --- a/libclamav/htmlnorm.c +++ b/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;