fixed memory access error on parsing of meta data which had errors (bug

* HTMLparser.c: fixed memory access error on parsing of meta data
  which had errors (bug #382206).  Also cleaned up a few warnings
  by adding some additional DECL macros.

svn path=/trunk/; revision=3593
This commit is contained in:
William M. Brack 2007-03-21 06:16:02 +00:00
parent bd44484bb0
commit e978ae25ca
2 changed files with 12 additions and 6 deletions

View File

@ -1,3 +1,9 @@
Wed Mar 21 14:23:08 HKT 2007 William Brack <wbrack@mmm.com.hk>
* HTMLparser.c: fixed memory access error on parsing of meta data
which had errors (bug #382206). Also cleaned up a few warnings
by adding some additional DECL macros.
Tue Mar 20 09:58:13 CET 2007 Daniel Veillard <daniel@veillard.com>
* nanoftp.c: applied patch from Björn Wiberg to try to fix again

View File

@ -698,7 +698,7 @@ html40ElementTable[] = {
DECL html_flow, NULL, DECL html_attrs, DECL align_attr, NULL
},
{ "dl", 0, 0, 0, 0, 0, 0, 0, "definition list ",
DECL dl_contents , "dd" , html_attrs, DECL compact_attr, NULL
DECL dl_contents , "dd" , DECL html_attrs, DECL compact_attr, NULL
},
{ "dt", 0, 1, 0, 0, 0, 0, 0, "definition term ",
DECL html_inline, NULL, DECL html_attrs, NULL, NULL
@ -755,7 +755,7 @@ html40ElementTable[] = {
DECL html_flow, NULL, NULL, DECL iframe_attrs, NULL
},
{ "img", 0, 2, 2, 1, 0, 0, 1, "embedded image ",
EMPTY, NULL, DECL img_attrs, DECL align_attr, src_alt_attrs
EMPTY, NULL, DECL img_attrs, DECL align_attr, DECL src_alt_attrs
},
{ "input", 0, 2, 2, 1, 0, 0, 1, "form control ",
EMPTY, NULL, DECL input_attrs , DECL align_attr, NULL
@ -782,7 +782,7 @@ html40ElementTable[] = {
EMPTY, NULL, DECL link_attrs, DECL target_attr, NULL
},
{ "map", 0, 0, 0, 0, 0, 0, 2, "client-side image map ",
DECL map_contents , NULL, DECL html_attrs , NULL, name_attr
DECL map_contents , NULL, DECL html_attrs , NULL, DECL name_attr
},
{ "menu", 0, 0, 0, 0, 1, 1, 0, "menu list ",
DECL blockli_elt , NULL, NULL, DECL compact_attrs, NULL
@ -803,7 +803,7 @@ html40ElementTable[] = {
DECL li_elt , "li" , DECL html_attrs, DECL ol_attrs, NULL
},
{ "optgroup", 0, 0, 0, 0, 0, 0, 0, "option group ",
option_elt , "option", DECL optgroup_attrs, NULL, DECL label_attr
DECL option_elt , "option", DECL optgroup_attrs, NULL, DECL label_attr
},
{ "option", 0, 1, 0, 0, 0, 0, 0, "selectable choice " ,
DECL html_pcdata, NULL, DECL option_attrs, NULL, NULL
@ -812,7 +812,7 @@ html40ElementTable[] = {
DECL html_inline, NULL, DECL html_attrs, DECL align_attr, NULL
},
{ "param", 0, 2, 2, 1, 0, 0, 0, "named property value ",
EMPTY, NULL, DECL param_attrs, NULL, name_attr
EMPTY, NULL, DECL param_attrs, NULL, DECL name_attr
},
{ "pre", 0, 0, 0, 0, 0, 0, 0, "preformatted text ",
DECL pre_content, NULL, DECL html_attrs, DECL width_attr, NULL
@ -3594,7 +3594,7 @@ failed:
/*
* Handle specific association to the META tag
*/
if (meta)
if (meta && (nbatts != 0))
htmlCheckMeta(ctxt, atts);
/*