dbertoni 02/01/22 15:06:49
Modified: c/src/XSLT XSLTEngineImpl.cpp
Log:
Make sure we don't try to use a null systemID. If a FormatterListener
instance already has a PrefixResolver instance, then go ahead and use that one.
Revision Changes Path
1.131 +9 -2 xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp
Index: XSLTEngineImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- XSLTEngineImpl.cpp 3 Jan 2002 21:48:00 -0000 1.130
+++ XSLTEngineImpl.cpp 22 Jan 2002 23:06:49 -0000 1.131
@@ -400,7 +400,7 @@
FormatterListener* const theFormatter =
outputTarget.getDocumentHandler();
- if (theFormatter != 0)
+ if (theFormatter != 0 && theFormatter->getPrefixResolver() == 0)
{
theFormatter->setPrefixResolver(this);
}
@@ -1373,6 +1373,8 @@
+static const XalanDOMChar theDummy = 0;
+
void
XSLTEngineImpl::problem(
const XalanDOMString& msg,
@@ -1380,7 +1382,12 @@
const Locator&
locator,
const XalanNode*
sourceNode) const
{
- const XalanDOMChar* const id = locator.getSystemId();
+ const XalanDOMChar* id = locator.getSystemId();
+
+ if (id == 0)
+ {
+ id = &theDummy;
+ }
const int lineNumber =
locator.getLineNumber();
const int columnNumber =
locator.getColumnNumber();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
