shaba/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2024-10-26 20:25:14 +03:00
Code Releases Activity

fix for bug #312945 as pointed by Dean Hill, the context type was not

Browse Source 
* xmlschemas.c: fix for bug #312945 as pointed by Dean Hill, the
  context type was not always properly initialized.
Daniel
This commit is contained in:
Daniel Veillard 2005-08-10 21:40:02 +00:00
parent 60faf528d8
commit 210536bd32
2 changed files with 8 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Aug 10 23:39:02 CEST 2005 Daniel Veillard <daniel@veillard.com>
* xmlschemas.c: fix for bug #312945 as pointed by Dean Hill, the
context type was not always properly initialized.
Wed Aug 10 18:21:41 CEST 2005 Daniel Veillard <daniel@veillard.com>
* relaxng.c: fixed bug #307377 about validation of choices in

74
xmlschemas.c
View File

@ -8532,73 +8532,6 @@ xmlSchemaCleanupDoc(xmlSchemaParserCtxtPtr ctxt, xmlNodePtr root)
}
/**
* xmlSchemaImportSchema
*
* @ctxt: a schema validation context
* @schemaLocation: an URI defining where to find the imported schema
*
* import a XML schema
* *WARNING* this interface is highly subject to change
*
* Returns -1 in case of error and 1 in case of success.
*/
#if 0
static xmlSchemaImportPtr
xmlSchemaImportSchema(xmlSchemaParserCtxtPtr ctxt,
const xmlChar *schemaLocation)
{
xmlSchemaImportPtr import;
xmlSchemaParserCtxtPtr newctxt;
newctxt = (xmlSchemaParserCtxtPtr) xmlMalloc(sizeof(xmlSchemaParserCtxt));
if (newctxt == NULL) {
xmlSchemaPErrMemory(ctxt, "allocating schema parser context",
NULL);
return (NULL);
}
memset(newctxt, 0, sizeof(xmlSchemaParserCtxt));
/* Keep the same dictionnary for parsing, really */
xmlDictReference(ctxt->dict);
newctxt->dict = ctxt->dict;
newctxt->includes = 0;
newctxt->URL = xmlDictLookup(newctxt->dict, schemaLocation, -1);
xmlSchemaSetParserErrors(newctxt, ctxt->error, ctxt->warning,
ctxt->userData);
import = (xmlSchemaImport*) xmlMalloc(sizeof(xmlSchemaImport));
if (import == NULL) {
xmlSchemaPErrMemory(NULL, "allocating imported schema",
NULL);
xmlSchemaFreeParserCtxt(newctxt);
return (NULL);
}
memset(import, 0, sizeof(xmlSchemaImport));
import->schemaLocation = xmlDictLookup(ctxt->dict, schemaLocation, -1);
import->schema = xmlSchemaParse(newctxt);
if (import->schema == NULL) {
/* FIXME use another error enum here ? */
xmlSchemaPErr(ctxt, NULL, XML_SCHEMAP_INTERNAL,
"Failed to import schema from location \"%s\".\n",
schemaLocation, NULL);
xmlSchemaFreeParserCtxt(newctxt);
/* The schemaLocation is held by the dictionary.
if (import->schemaLocation != NULL)
xmlFree((xmlChar *)import->schemaLocation);
*/
xmlFree(import);
return NULL;
}
xmlSchemaFreeParserCtxt(newctxt);
return import;
}
#endif
static void
xmlSchemaClearSchemaDefaults(xmlSchemaPtr schema)
{
@ -8826,10 +8759,6 @@ static xmlSchemaParserCtxtPtr
xmlSchemaNewParserCtxtUseDict(const char *URL, xmlDictPtr dict)
{
xmlSchemaParserCtxtPtr ret;
/*
if (URL == NULL)
return (NULL);
*/
ret = (xmlSchemaParserCtxtPtr) xmlMalloc(sizeof(xmlSchemaParserCtxt));
if (ret == NULL) {
@ -8839,6 +8768,7 @@ xmlSchemaNewParserCtxtUseDict(const char *URL, xmlDictPtr dict)
}
memset(ret, 0, sizeof(xmlSchemaParserCtxt));
ret->dict = dict;
ret->type = XML_SCHEMA_CTXT_PARSER;
xmlDictReference(dict);
if (URL != NULL)
ret->URL = xmlDictLookup(dict, (const xmlChar *) URL, -1);
@ -10862,6 +10792,7 @@ xmlSchemaNewMemParserCtxt(const char *buffer, int size)
ret->buffer = buffer;
ret->size = size;
ret->dict = xmlDictCreate();
ret->type = XML_SCHEMA_CTXT_PARSER;
return (ret);
}
@ -10891,6 +10822,7 @@ xmlSchemaNewDocParserCtxt(xmlDocPtr doc)
memset(ret, 0, sizeof(xmlSchemaParserCtxt));
ret->doc = doc;
ret->dict = xmlDictCreate();
ret->type = XML_SCHEMA_CTXT_PARSER;
/* The application has responsibility for the document */
ret->preserve = 1;