aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugh Davenport <hugh@allthethings.co.nz>2015-11-20 17:16:06 +0800
committerDaniel Veillard <veillard@redhat.com>2015-11-20 17:16:06 +0800
commit8fb4a770075628d6441fb17a1e435100e2f3b1a2 (patch)
treeb196187045e8ae080804e71ee65f6d9940491d95
parentf1063fdbe7fa66332bbb76874101c2a7b51b519f (diff)
downloadandroid_external_libxml2-8fb4a770075628d6441fb17a1e435100e2f3b1a2.tar.gz
android_external_libxml2-8fb4a770075628d6441fb17a1e435100e2f3b1a2.tar.bz2
android_external_libxml2-8fb4a770075628d6441fb17a1e435100e2f3b1a2.zip
CVE-2015-8242 Buffer overead with HTML parser in push mode
For https://bugzilla.gnome.org/show_bug.cgi?id=756372 Error in the code pointing to the codepoint in the stack for the current char value instead of the pointer in the input that the SAX callback expects Reported and fixed by Hugh Davenport
-rw-r--r--HTMLparser.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/HTMLparser.c b/HTMLparser.c
index bdf78071..b7291972 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -5735,17 +5735,17 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
if (ctxt->keepBlanks) {
if (ctxt->sax->characters != NULL)
ctxt->sax->characters(
- ctxt->userData, &cur, 1);
+ ctxt->userData, &in->cur[0], 1);
} else {
if (ctxt->sax->ignorableWhitespace != NULL)
ctxt->sax->ignorableWhitespace(
- ctxt->userData, &cur, 1);
+ ctxt->userData, &in->cur[0], 1);
}
} else {
htmlCheckParagraph(ctxt);
if (ctxt->sax->characters != NULL)
ctxt->sax->characters(
- ctxt->userData, &cur, 1);
+ ctxt->userData, &in->cur[0], 1);
}
}
ctxt->token = 0;