aboutsummaryrefslogtreecommitdiffstats
path: root/xmllint.c
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@redhat.com>2009-07-29 11:34:50 +0200
committerDaniel Veillard <veillard@redhat.com>2009-07-29 11:34:50 +0200
commit023d0babc41da367f9272d4acc825bdd862f7a9c (patch)
tree02902296bc9df785911b3172dace34076574011c /xmllint.c
parent669e88c0650646a6d4eae978296ad753a2a47b7f (diff)
downloadandroid_external_libxml2-023d0babc41da367f9272d4acc825bdd862f7a9c.tar.gz
android_external_libxml2-023d0babc41da367f9272d4acc825bdd862f7a9c.tar.bz2
android_external_libxml2-023d0babc41da367f9272d4acc825bdd862f7a9c.zip
Fix leak on SAX1, xmllint --sax1 option and debug
* SAX2.c: don't leak in xmlCheckDefaultedAttributes for standalone checking * xmllint.c: fix xmllint --sax1 to actually use XML_PARSE_SAX1 * debugXML.c: don't raise an error if markup wasn't allocated from dictionary if document was parsed with option disabling it
Diffstat (limited to 'xmllint.c')
-rw-r--r--xmllint.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/xmllint.c b/xmllint.c
index a668570e..c324ef30 100644
--- a/xmllint.c
+++ b/xmllint.c
@@ -3221,16 +3221,17 @@ main(int argc, char **argv) {
#ifdef LIBXML_SAX1_ENABLED
else if ((!strcmp(argv[i], "-sax1")) ||
(!strcmp(argv[i], "--sax1"))) {
- sax1++;
+ sax1++;
+ options |= XML_PARSE_SAX1;
}
#endif /* LIBXML_SAX1_ENABLED */
else if ((!strcmp(argv[i], "-sax")) ||
(!strcmp(argv[i], "--sax"))) {
- sax++;
+ sax++;
}
else if ((!strcmp(argv[i], "-chkregister")) ||
(!strcmp(argv[i], "--chkregister"))) {
- chkregister++;
+ chkregister++;
#ifdef LIBXML_SCHEMAS_ENABLED
} else if ((!strcmp(argv[i], "-relaxng")) ||
(!strcmp(argv[i], "--relaxng"))) {