lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-21 14:53:44 +03:00
Code Activity

fixed second spot where CRLF split between chunks could cause trouble (bug

Browse Source 
* parser.c: fixed second spot where CRLF split between chunks
  could cause trouble (bug #319279)
* gentest.py, testapi.c: fixed two problems involved with
  --with-minimum compilation (compilation errors with schematron
  and formal expressions tests)
This commit is contained in:
William M. Brack
2005-10-22 02:04:26 +00:00
parent 2e2691b51c
commit dc904f1f81
4 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
Sat Oct 22 10:00:41 HKT 2005 William Brack <wbrack@mmm.com.hk>
* parser.c: fixed second spot where CRLF split between chunks
could cause trouble (bug #319279)
* gentest.py, testapi.c: fixed two problems involved with
--with-minimum compilation (compilation errors with schematron
and formal expressions tests)
Fri Oct 21 10:50:14 EDT 2005 Rob Richards <rrichards@ctindustries.net> Fri Oct 21 10:50:14 EDT 2005 Rob Richards <rrichards@ctindustries.net>
* xmlsave.c: prevent output of fragment tags when serializing XHTML. * xmlsave.c: prevent output of fragment tags when serializing XHTML.

1
gentest.py
View File

@@ -46,6 +46,7 @@ modules_defines = {
"DOCBparser" : "LIBXML_DOCB_ENABLED", "DOCBparser" : "LIBXML_DOCB_ENABLED",
"xmlmodule" : "LIBXML_MODULES_ENABLED", "xmlmodule" : "LIBXML_MODULES_ENABLED",
"pattern" : "LIBXML_PATTERN_ENABLED", "pattern" : "LIBXML_PATTERN_ENABLED",
"schematron" : "LIBXML_SCHEMATRON_ENABLED",
} }
# #

4
parser.c
View File

@@ -3543,6 +3543,8 @@ get_more:
ctxt->input->cur = in; ctxt->input->cur = in;
if (*in == 0xD) { if (*in == 0xD) {
in++; in++;
if (!*in) /* if end of current chunk return */
return;
if (*in == 0xA) { if (*in == 0xA) {
ctxt->input->cur = in; ctxt->input->cur = in;
in++; in++;
@@ -3937,6 +3939,8 @@ get_more:
ctxt->input->line++; ctxt->input->col = 1; ctxt->input->line++; ctxt->input->col = 1;
continue; /* while */ continue; /* while */
} }
if (!*in) /* if end of current chunk return */
return;
in--; in--;
} }
SHRINK; SHRINK;

55
testapi.c
View File

@@ -8,7 +8,13 @@
* daniel@veillard.com * daniel@veillard.com
*/ */
#include <stdio.h> #include "config.h"
#ifndef WITH_TRIO
#include <stdio.h>
#else
#define TRIO_REPLACE_STDIO
#include "trio.h"
#endif
#include <string.h> #include <string.h>
#include <libxml/xmlerror.h> #include <libxml/xmlerror.h>
#include <libxml/relaxng.h> #include <libxml/relaxng.h>
@@ -689,6 +695,24 @@ static xmlCharEncoding gen_xmlCharEncoding(int no, int nr ATTRIBUTE_UNUSED) {
static void des_xmlCharEncoding(int no ATTRIBUTE_UNUSED, xmlCharEncoding val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { static void des_xmlCharEncoding(int no ATTRIBUTE_UNUSED, xmlCharEncoding val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
} }
#if defined(LIBXML_REGEXP_ENABLED) && defined(LIBXML_EXPR_ENABLED)
#define gen_nb_xmlExpCtxtPtr 1
static xmlExpCtxtPtr gen_xmlExpCtxtPtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
return(NULL);
}
static void des_xmlExpCtxtPtr(int no ATTRIBUTE_UNUSED, xmlExpCtxtPtr val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
}
#define gen_nb_xmlExpNodePtr 1
static xmlExpNodePtr gen_xmlExpNodePtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
return(NULL);
}
static void des_xmlExpNodePtr(int no ATTRIBUTE_UNUSED, xmlExpNodePtr val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
}
#endif
#define gen_nb_xmlHashDeallocator 2 #define gen_nb_xmlHashDeallocator 2
static void static void
test_xmlHashDeallocator(void *payload ATTRIBUTE_UNUSED, xmlChar *name ATTRIBUTE_UNUSED) { test_xmlHashDeallocator(void *payload ATTRIBUTE_UNUSED, xmlChar *name ATTRIBUTE_UNUSED) {
@@ -17757,6 +17781,7 @@ test_xmlSchematronNewParserCtxt(void) {
return(test_ret); return(test_ret);
} }
#ifdef LIBXML_SCHEMATRON_ENABLED
#define gen_nb_xmlSchematronPtr 1 #define gen_nb_xmlSchematronPtr 1
static xmlSchematronPtr gen_xmlSchematronPtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { static xmlSchematronPtr gen_xmlSchematronPtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
@@ -17764,6 +17789,8 @@ static xmlSchematronPtr gen_xmlSchematronPtr(int no ATTRIBUTE_UNUSED, int nr ATT
} }
static void des_xmlSchematronPtr(int no ATTRIBUTE_UNUSED, xmlSchematronPtr val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { static void des_xmlSchematronPtr(int no ATTRIBUTE_UNUSED, xmlSchematronPtr val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
} }
#endif
static int static int
test_xmlSchematronNewValidCtxt(void) { test_xmlSchematronNewValidCtxt(void) {
@@ -17774,6 +17801,7 @@ test_xmlSchematronNewValidCtxt(void) {
return(test_ret); return(test_ret);
} }
#ifdef LIBXML_SCHEMATRON_ENABLED
#define gen_nb_xmlSchematronParserCtxtPtr 1 #define gen_nb_xmlSchematronParserCtxtPtr 1
static xmlSchematronParserCtxtPtr gen_xmlSchematronParserCtxtPtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { static xmlSchematronParserCtxtPtr gen_xmlSchematronParserCtxtPtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
@@ -17781,6 +17809,8 @@ static xmlSchematronParserCtxtPtr gen_xmlSchematronParserCtxtPtr(int no ATTRIBUT
} }
static void des_xmlSchematronParserCtxtPtr(int no ATTRIBUTE_UNUSED, xmlSchematronParserCtxtPtr val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { static void des_xmlSchematronParserCtxtPtr(int no ATTRIBUTE_UNUSED, xmlSchematronParserCtxtPtr val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
} }
#endif
static int static int
test_xmlSchematronParse(void) { test_xmlSchematronParse(void) {
@@ -17791,6 +17821,7 @@ test_xmlSchematronParse(void) {
return(test_ret); return(test_ret);
} }
#ifdef LIBXML_SCHEMATRON_ENABLED
#define gen_nb_xmlSchematronValidCtxtPtr 1 #define gen_nb_xmlSchematronValidCtxtPtr 1
static xmlSchematronValidCtxtPtr gen_xmlSchematronValidCtxtPtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { static xmlSchematronValidCtxtPtr gen_xmlSchematronValidCtxtPtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
@@ -17798,6 +17829,8 @@ static xmlSchematronValidCtxtPtr gen_xmlSchematronValidCtxtPtr(int no ATTRIBUTE_
} }
static void des_xmlSchematronValidCtxtPtr(int no ATTRIBUTE_UNUSED, xmlSchematronValidCtxtPtr val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) { static void des_xmlSchematronValidCtxtPtr(int no ATTRIBUTE_UNUSED, xmlSchematronValidCtxtPtr val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
} }
#endif
static int static int
test_xmlSchematronValidateDoc(void) { test_xmlSchematronValidateDoc(void) {
@@ -31935,16 +31968,6 @@ test_xmlreader(void) {
printf("Module xmlreader: %d errors\n", test_ret); printf("Module xmlreader: %d errors\n", test_ret);
return(test_ret); return(test_ret);
} }
#ifdef LIBXML_REGEXP_ENABLED
#define gen_nb_xmlExpCtxtPtr 1
static xmlExpCtxtPtr gen_xmlExpCtxtPtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
return(NULL);
}
static void des_xmlExpCtxtPtr(int no ATTRIBUTE_UNUSED, xmlExpCtxtPtr val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
}
#endif
static int static int
test_xmlExpCtxtNbCons(void) { test_xmlExpCtxtNbCons(void) {
@@ -32013,16 +32036,6 @@ test_xmlExpCtxtNbNodes(void) {
return(test_ret); return(test_ret);
} }
#ifdef LIBXML_REGEXP_ENABLED
#define gen_nb_xmlExpNodePtr 1
static xmlExpNodePtr gen_xmlExpNodePtr(int no ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
return(NULL);
}
static void des_xmlExpNodePtr(int no ATTRIBUTE_UNUSED, xmlExpNodePtr val ATTRIBUTE_UNUSED, int nr ATTRIBUTE_UNUSED) {
}
#endif
static int static int
test_xmlExpDump(void) { test_xmlExpDump(void) {