made powten array static it should not be exported fix bug #107361 by
* xmlschemastype.c: made powten array static it should not be exported
* HTMLparser.c: fix bug #107361 by reusing the code from the XML
parser function.
* testHTML.c: get rid of valgrind messages on the HTML SAX tests
Daniel
diff --git a/ChangeLog b/ChangeLog
index c52b251..3b728d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Mar 5 10:57:09 CET 2003 Daniel Veillard <daniel@veillard.com>
+
+ * xmlschemastype.c: made powten array static it should not be exported
+ * HTMLparser.c: fix bug #107361 by reusing the code from the XML
+ parser function.
+ * testHTML.c: get rid of valgrind messages on the HTML SAX tests
+
Fri Feb 28 00:23:00 CET 2003 Daniel Veillard <daniel@veillard.com>
* tree.c: fixed a node dump crash on attributes
diff --git a/HTMLparser.c b/HTMLparser.c
index 75e9229..38a442c 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -5231,16 +5231,27 @@
if (filename == NULL)
inputStream->filename = NULL;
else
- inputStream->filename = xmlMemStrdup(filename);
+ inputStream->filename = (char *)
+ xmlCanonicPath((const xmlChar *) filename);
inputStream->buf = buf;
inputStream->base = inputStream->buf->buffer->content;
inputStream->cur = inputStream->buf->buffer->content;
+ inputStream->end =
+ &inputStream->buf->buffer->content[inputStream->buf->buffer->use];
inputPush(ctxt, inputStream);
if ((size > 0) && (chunk != NULL) && (ctxt->input != NULL) &&
(ctxt->input->buf != NULL)) {
+ int base = ctxt->input->base - ctxt->input->buf->buffer->content;
+ int cur = ctxt->input->cur - ctxt->input->base;
+
xmlParserInputBufferPush(ctxt->input->buf, size, chunk);
+
+ ctxt->input->base = ctxt->input->buf->buffer->content + base;
+ ctxt->input->cur = ctxt->input->base + cur;
+ ctxt->input->end =
+ &ctxt->input->buf->buffer->content[ctxt->input->buf->buffer->use];
#ifdef DEBUG_PUSH
xmlGenericError(xmlGenericErrorContext, "HPP: pushed %d\n", size);
#endif
diff --git a/testHTML.c b/testHTML.c
index dbfccc3..3709afe 100644
--- a/testHTML.c
+++ b/testHTML.c
@@ -375,7 +375,8 @@
while ((attlen = strlen((char*)att)) > 0) {
outlen = sizeof output - 1;
htmlEncodeEntities(output, &outlen, att, &attlen, '\'');
- fprintf(stdout, "%.*s", outlen, output);
+ output[outlen] = 0;
+ fprintf(stdout, "%s", output);
att += attlen;
}
fprintf(stdout, "'");
diff --git a/xmlschemastypes.c b/xmlschemastypes.c
index 051af8d..bda7336 100644
--- a/xmlschemastypes.c
+++ b/xmlschemastypes.c
@@ -85,7 +85,7 @@
XML_SCHEMAS_UBYTE
} xmlSchemaValType;
-unsigned long powten[10] = {
+static unsigned long powten[10] = {
1, 10, 100, 1000, 10000, 100000, 1000000, 10000000L,
100000000L, 1000000000L
};