Skip to content
Snippets Groups Projects
Commit 834b2e8bd510 authored by Daniel Veillard's avatar Daniel Veillard
Browse files

fix a crash on solaris when a printf %s with a NULL argument occurs,

* xmlschemas.c: fix a crash on solaris when a printf %s with a NULL
  argument occurs, should fix #450936
Daniel

svn path=/trunk/; revision=3641
parent e35e19bcf5d2
No related branches found
No related tags found
No related merge requests found
Tue Jun 26 13:30:50 CEST 2007 Daniel Veillard <daniel@veillard.com>
* xmlschemas.c: fix a crash on solaris when a printf %s with a NULL
argument occurs, should fix #450936
Wed Jun 13 13:33:38 PDT 2007 William Brack <wbrack@mmm.com.hk>
 
* xpath.c: fixed problem in previous fix to xmlXPathNodeSetSort
......
......@@ -36,7 +36,7 @@
workaround wrong file: URIs, htmlNodeDumpFormatOutput on attributes,
invalid character in attribute detection bug, big comments before
internal subset streaming bug, HTML parsing of attributes with : in
the name
the name, IDness of name in HTML (Dagfinn I. Mannsker)
- Improvement: keep URI query parts in raw form (Richard Jones),
embed tag support in HTML (Michael Day)
......
......@@ -32,7 +32,7 @@
workaround wrong file: URIs, htmlNodeDumpFormatOutput on attributes,
invalid character in attribute detection bug, big comments before
internal subset streaming bug, HTML parsing of attributes with : in
the name </li>
the name, IDness of name in HTML (Dagfinn I. Mannsker) </li>
<li>Improvement: keep URI query parts in raw form (Richard Jones),
embed tag support in HTML (Michael Day) </li>
</ul><h3>2.6.28: Apr 17 2007</h3><ul><li>Documentation: comment fixes (Markus Keim), xpath comments fixes too
......
......@@ -10346,6 +10346,8 @@
/* TODO: The following nasty cases will produce an error. */
if ((WXS_IS_BUCKET_IMPMAIN(type)) && (! bkt->imported)) {
/* We included/redefined and then try to import a schema. */
if (schemaLocation == NULL)
schemaLocation = BAD_CAST "in_memory_buffer";
xmlSchemaCustomErr(ACTXT_CAST pctxt, err,
invokingNode, NULL,
"The schema document '%s' cannot be imported, since "
......@@ -10354,6 +10356,8 @@
goto exit;
} else if ((! WXS_IS_BUCKET_IMPMAIN(type)) && (bkt->imported)) {
/* We imported and then try to include/redefine a schema. */
if (schemaLocation == NULL)
schemaLocation = BAD_CAST "in_memory_buffer";
xmlSchemaCustomErr(ACTXT_CAST pctxt, err,
invokingNode, NULL,
"The schema document '%s' cannot be included or "
......@@ -10404,6 +10408,9 @@
* URGENT TODO: We should report a warning here.
* res = XML_SCHEMAP_SRC_IMPORT;
*/
if (schemaLocation == NULL)
schemaLocation = BAD_CAST "in_memory_buffer";
xmlSchemaCustomWarning(ACTXT_CAST pctxt,
XML_SCHEMAP_WARN_SKIP_SCHEMA,
invokingNode, NULL,
......@@ -10484,7 +10491,8 @@
if (schemaDoc->URL != NULL)
schemaLocation = xmlDictLookup(pctxt->dict,
schemaDoc->URL, -1);
else
schemaLocation = BAD_CAST "in_memory_buffer";
} else if ((schemaLocation != NULL) || (schemaBuffer != NULL)) {
xmlParserCtxtPtr parserCtxt;
 
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment