Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 04:52:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for bug 248258 (Mozilla 1.7 and Firefox 0.8.0 Crash when I try to open this XSLT stylesheet [@ txMozillaXSLTProcessor::DoTransform ]). r=sicking, sr=jst.

Browse Source
This commit is contained in:
peterv%propagandism.org 2005-01-12 13:50:11 +00:00
parent 43efb2238c
commit f343d1b0ed
17 changed files with 102 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/transformiix/source/xslt/txBufferingHandler.cpp
View File

@ -208,7 +208,7 @@ txBufferingHandler::comment(const nsAString& aData)
}
void
txBufferingHandler::endDocument()
txBufferingHandler::endDocument(nsresult aResult)
{
if (!mBuffer) {
return;

4
extensions/transformiix/source/xslt/txExecutionState.cpp
View File

@ -199,10 +199,10 @@ txExecutionState::init(const txXPathNode& aNode,
}
nsresult
txExecutionState::end()
txExecutionState::end(nsresult aResult)
{
popTemplateRule();
mOutputHandler->endDocument();
mOutputHandler->endDocument(aResult);
return NS_OK;
}

2
extensions/transformiix/source/xslt/txExecutionState.h
View File

@ -95,7 +95,7 @@ public:
txExecutionState(txStylesheet* aStylesheet);
~txExecutionState();
nsresult init(const txXPathNode& aNode, txExpandedNameMap* aGlobalParams);
nsresult end();
nsresult end(nsresult aResult);
TX_DECL_MATCH_CONTEXT;

10
extensions/transformiix/source/xslt/txMozillaTextOutput.cpp
View File

@ -101,11 +101,13 @@ void txMozillaTextOutput::comment(const nsAString& aData)
{
}
void txMozillaTextOutput::endDocument()
void txMozillaTextOutput::endDocument(nsresult aResult)
{
nsCOMPtr<nsITransformObserver> observer = do_QueryReferent(mObserver);
if (observer) {
observer->OnTransformDone(NS_OK, mDocument);
if (NS_SUCCEEDED(aResult)) {
nsCOMPtr<nsITransformObserver> observer = do_QueryReferent(mObserver);
if (observer) {
observer->OnTransformDone(aResult, mDocument);
}
}
}

53
extensions/transformiix/source/xslt/txMozillaXMLOutput.cpp
View File

@ -70,6 +70,7 @@
#include "nsIHTMLDocument.h"
#include "nsIStyleSheetLinkingElement.h"
#include "nsIDocumentTransformer.h"
#include "nsICSSLoader.h"
extern nsINameSpaceManager* gTxNameSpaceManager;
@ -195,7 +196,7 @@ void txMozillaXMLOutput::comment(const nsAString& aData)
NS_ASSERTION(NS_SUCCEEDED(rv), "Can't append comment");
}
void txMozillaXMLOutput::endDocument()
void txMozillaXMLOutput::endDocument(nsresult aResult)
{
closePrevious(eCloseElement | eFlushText);
// This should really be handled by nsIDocument::Reset
@ -220,7 +221,7 @@ void txMozillaXMLOutput::endDocument()
}
if (mNotifier) {
mNotifier->OnTransformEnd();
mNotifier->OnTransformEnd(aResult);
}
}
@ -836,8 +837,8 @@ txTransformNotifier::ScriptAvailable(nsresult aResult,
PRInt32 aLineNo,
const nsAString& aScript)
{
if (NS_FAILED(aResult)) {
mScriptElements.RemoveObject(aElement);
if (NS_FAILED(aResult) &&
mScriptElements.RemoveObject(aElement)) {
SignalTransformEnd();
}
@ -850,8 +851,10 @@ txTransformNotifier::ScriptEvaluated(nsresult aResult,
PRBool aIsInline,
PRBool aWasPending)
{
mScriptElements.RemoveObject(aElement);
SignalTransformEnd();
if (mScriptElements.RemoveObject(aElement)) {
SignalTransformEnd();
}
return NS_OK;
}
@ -889,10 +892,10 @@ txTransformNotifier::AddStyleSheet(nsIStyleSheet* aStyleSheet)
}
void
txTransformNotifier::OnTransformEnd()
txTransformNotifier::OnTransformEnd(nsresult aResult)
{
mInTransform = PR_FALSE;
SignalTransformEnd();
SignalTransformEnd(aResult);
}
void
@ -911,29 +914,37 @@ txTransformNotifier::SetOutputDocument(nsIDOMDocument* aDocument)
}
void
txTransformNotifier::SignalTransformEnd()
txTransformNotifier::SignalTransformEnd(nsresult aResult)
{
if (mInTransform || mScriptElements.Count() > 0 ||
mStylesheets.Count() > 0) {
if (mInTransform || (NS_SUCCEEDED(aResult) &&
mScriptElements.Count() > 0 || mStylesheets.Count() > 0)) {
return;
}
mStylesheets.Clear();
mScriptElements.Clear();
// Make sure that we don't get deleted while this function is executed and
// we remove ourselfs from the scriptloader
nsCOMPtr<nsIScriptLoaderObserver> kungFuDeathGrip(this);
// XXX Need a better way to determine transform success/failure
if (mDocument) {
nsCOMPtr<nsIDocument> doc = do_QueryInterface(mDocument);
nsIScriptLoader *loader = doc->GetScriptLoader();
if (loader) {
loader->RemoveObserver(this);
nsCOMPtr<nsIDocument> doc = do_QueryInterface(mDocument);
if (doc) {
nsIScriptLoader *scriptLoader = doc->GetScriptLoader();
if (scriptLoader) {
scriptLoader->RemoveObserver(this);
// XXX Maybe we want to cancel script loads if NS_FAILED(rv)?
}
mObserver->OnTransformDone(NS_OK, mDocument);
if (NS_FAILED(aResult)) {
nsICSSLoader *cssLoader = doc->GetCSSLoader();
if (cssLoader) {
cssLoader->Stop();
}
}
}
else {
// XXX Need better error message and code.
mObserver->OnTransformDone(NS_ERROR_FAILURE, nsnull);
if (NS_SUCCEEDED(aResult)) {
mObserver->OnTransformDone(aResult, mDocument);
}
}

4
extensions/transformiix/source/xslt/txMozillaXMLOutput.h
View File

@ -72,12 +72,12 @@ public:
void Init(nsITransformObserver* aObserver);
void AddScriptElement(nsIScriptElement* aElement);
void AddStyleSheet(nsIStyleSheet* aStyleSheet);
void OnTransformEnd();
void OnTransformEnd(nsresult aResult = NS_OK);
void OnTransformStart();
void SetOutputDocument(nsIDOMDocument* aDocument);
private:
void SignalTransformEnd();
void SignalTransformEnd(nsresult aResult = NS_OK);
nsCOMPtr<nsIDOMDocument> mDocument;
nsCOMPtr<nsITransformObserver> mObserver;

96
extensions/transformiix/source/xslt/txMozillaXSLTProcessor.cpp
View File

@ -292,31 +292,7 @@ txMozillaXSLTProcessor::TransformDocument(nsIDOMNode* aSourceDOM,
mSource = aSourceDOM;
nsAutoPtr<txXPathNode> sourceNode(txXPathNativeNode::createXPathNode(aSourceDOM));
if (!sourceNode) {
return NS_ERROR_OUT_OF_MEMORY;
}
nsCOMPtr<nsIDOMDocument> sourceDOMDocument;
aSourceDOM->GetOwnerDocument(getter_AddRefs(sourceDOMDocument));
if (!sourceDOMDocument) {
sourceDOMDocument = do_QueryInterface(aSourceDOM);
}
txExecutionState es(mStylesheet);
txToDocHandlerFactory handlerFactory(&es, sourceDOMDocument, aOutputDoc,
nsnull);
es.mOutputHandlerFactory = &handlerFactory;
es.init(*sourceNode, &mVariables);
// Process root of XML source document
rv = txXSLTProcessor::execute(es);
// XXX setup exception context, bug 204658
es.end();
return rv;
return TransformToDoc(aOutputDoc, nsnull);
}
NS_IMETHODIMP
@ -350,36 +326,7 @@ txMozillaXSLTProcessor::DoTransform()
NS_ENSURE_TRUE(mStylesheet, NS_ERROR_UNEXPECTED);
NS_ASSERTION(mObserver, "no observer");
nsAutoPtr<txXPathNode> sourceNode(txXPathNativeNode::createXPathNode(mSource));
if (!sourceNode) {
return NS_ERROR_OUT_OF_MEMORY;
}
nsCOMPtr<nsIDOMDocument> sourceDOMDocument;
mSource->GetOwnerDocument(getter_AddRefs(sourceDOMDocument));
if (!sourceDOMDocument) {
sourceDOMDocument = do_QueryInterface(mSource);
}
txExecutionState es(mStylesheet);
// XXX Need to add error observers
txToDocHandlerFactory handlerFactory(&es, sourceDOMDocument, nsnull,
mObserver);
es.mOutputHandlerFactory = &handlerFactory;
es.init(*sourceNode, &mVariables);
// Process root of XML source document
nsresult rv = txXSLTProcessor::execute(es);
if (NS_FAILED(rv) && mObserver) {
// XXX set up context information, bug 204655
reportError(rv, nsnull, nsnull);
}
es.end();
return rv;
return TransformToDoc(nsnull, nsnull);
}
NS_IMETHODIMP
@ -439,36 +386,49 @@ txMozillaXSLTProcessor::TransformToDocument(nsIDOMNode *aSource,
nsresult rv = ensureStylesheet();
NS_ENSURE_SUCCESS(rv, rv);
nsAutoPtr<txXPathNode> sourceNode(txXPathNativeNode::createXPathNode(aSource));
mSource = aSource;
return TransformToDoc(nsnull, aResult);
}
nsresult
txMozillaXSLTProcessor::TransformToDoc(nsIDOMDocument *aOutputDoc,
nsIDOMDocument **aResult)
{
nsAutoPtr<txXPathNode> sourceNode(txXPathNativeNode::createXPathNode(mSource));
if (!sourceNode) {
return NS_ERROR_OUT_OF_MEMORY;
}
nsCOMPtr<nsIDOMDocument> sourceDOMDocument;
aSource->GetOwnerDocument(getter_AddRefs(sourceDOMDocument));
mSource->GetOwnerDocument(getter_AddRefs(sourceDOMDocument));
if (!sourceDOMDocument) {
sourceDOMDocument = do_QueryInterface(aSource);
sourceDOMDocument = do_QueryInterface(mSource);
}
txExecutionState es(mStylesheet);
// XXX Need to add error observers
txToDocHandlerFactory handlerFactory(&es, sourceDOMDocument, nsnull,
nsnull);
txToDocHandlerFactory handlerFactory(&es, sourceDOMDocument, aOutputDoc,
mObserver);
es.mOutputHandlerFactory = &handlerFactory;
es.init(*sourceNode, &mVariables);
// Process root of XML source document
rv = txXSLTProcessor::execute(es);
// XXX setup exception context, bug 204658
es.end();
nsresult rv = txXSLTProcessor::execute(es);
es.end(rv);
if (NS_SUCCEEDED(rv)) {
txAOutputXMLEventHandler* handler =
NS_STATIC_CAST(txAOutputXMLEventHandler*, es.mOutputHandler);
handler->getOutputDocument(aResult);
if (aResult) {
txAOutputXMLEventHandler* handler =
NS_STATIC_CAST(txAOutputXMLEventHandler*, es.mOutputHandler);
handler->getOutputDocument(aResult);
}
}
else if (mObserver) {
// XXX set up context information, bug 204655
reportError(rv, nsnull, nsnull);
}
return rv;
@ -511,7 +471,7 @@ txMozillaXSLTProcessor::TransformToFragment(nsIDOMNode *aSource,
// Process root of XML source document
rv = txXSLTProcessor::execute(es);
// XXX setup exception context, bug 204658
es.end();
es.end(rv);
return rv;
}

2
extensions/transformiix/source/xslt/txMozillaXSLTProcessor.h
View File

@ -159,6 +159,8 @@ private:
nsresult DoTransform();
void notifyError();
nsresult ensureStylesheet();
nsresult TransformToDoc(nsIDOMDocument *aOutputDoc,
nsIDOMDocument **aResult);
nsRefPtr<txStylesheet> mStylesheet;
nsIDocument* mStylesheetDocument; // weak

2
extensions/transformiix/source/xslt/txRtfHandler.cpp
View File

@ -110,7 +110,7 @@ txRtfHandler::getAsRTF(txAExprResult** aResult)
return NS_OK;
}
void txRtfHandler::endDocument()
void txRtfHandler::endDocument(nsresult aResult)
{
}

2
extensions/transformiix/source/xslt/txRtfHandler.h
View File

@ -65,7 +65,7 @@ public:
nsresult getAsRTF(txAExprResult** aResult);
void endDocument();
void endDocument(nsresult aResult);
void startDocument();
};

2
extensions/transformiix/source/xslt/txStandaloneXSLTProcessor.cpp
View File

@ -224,7 +224,7 @@ txStandaloneXSLTProcessor::transform(txXPathNode& aSource,
// Process root of XML source document
nsresult rv = txXSLTProcessor::execute(es);
es.end();
es.end(rv);
#ifndef XP_WIN
aOut.sync_with_stdio(sync);

2
extensions/transformiix/source/xslt/txTextHandler.cpp
View File

@ -64,7 +64,7 @@ void txTextHandler::comment(const nsAString& aData)
{
}
void txTextHandler::endDocument()
void txTextHandler::endDocument(nsresult aResult)
{
}

2
extensions/transformiix/source/xslt/txTextOutput.cpp
View File

@ -63,7 +63,7 @@ void txTextOutput::comment(const nsAString& aData)
{
}
void txTextOutput::endDocument()
void txTextOutput::endDocument(nsresult aResult)
{
}

22
extensions/transformiix/source/xslt/txUnknownHandler.cpp
View File

@ -59,18 +59,28 @@ void txUnknownHandler::attribute(const nsAString& aName,
// XXX ErrorReport: Signal this?
}
void txUnknownHandler::endDocument()
void txUnknownHandler::endDocument(nsresult aResult)
{
if (NS_FAILED(aResult)) {
return;
}
// This is an unusual case, no output method has been set and we
// didn't create a document element. Switching to XML output mode
// anyway.
// Make sure that mEs->mResultHandler == this is true, otherwise we'll
// leak mEs->mResultHandler in createHandlerAndFlush and we'll crash on
// the last line (delete this).
NS_ASSERTION(mEs->mResultHandler == this,
"We're leaking mEs->mResultHandler and are going to crash.");
nsresult rv = createHandlerAndFlush(eXMLOutput, EmptyString(),
kNameSpaceID_None);
if (NS_FAILED(rv))
return;
mEs->mResultHandler->endDocument();
mEs->mResultHandler->endDocument(aResult);
delete this;
}
@ -78,6 +88,12 @@ void txUnknownHandler::endDocument()
void txUnknownHandler::startElement(const nsAString& aName,
const PRInt32 aNsID)
{
// Make sure that mEs->mResultHandler == this is true, otherwise we'll
// leak mEs->mResultHandler in createHandlerAndFlush and we may crash
// later on trying to delete this handler again.
NS_ASSERTION(mEs->mResultHandler == this,
"We're leaking mEs->mResultHandler.");
nsresult rv = NS_OK;
txOutputFormat* format = mEs->mStylesheet->getOutputFormat();
if (format->mMethod != eMethodNotSet) {
@ -109,7 +125,7 @@ nsresult txUnknownHandler::createHandlerAndFlush(txOutputMethod aMethod,
format.merge(*mEs->mStylesheet->getOutputFormat());
format.mMethod = aMethod;
txAXMLEventHandler* handler = 0;
txAXMLEventHandler *handler = nsnull;
nsresult rv = mEs->mOutputHandlerFactory->createHandlerWith(&format, aName,
aNsID,
&handler);

2
extensions/transformiix/source/xslt/txUnknownHandler.h
View File

@ -52,7 +52,7 @@ public:
void attribute(const nsAString& aName, const PRInt32 aNsID,
const nsAString& aValue);
void endDocument();
void endDocument(nsresult aResult);
void startElement(const nsAString& aName, const PRInt32 aNsID);
private:

4
extensions/transformiix/source/xslt/txXMLEventHandler.h
View File

@ -92,7 +92,7 @@ public:
* Signals the end of a document. It is an error to call
* this method more than once.
*/
virtual void endDocument() = 0;
virtual void endDocument(nsresult aResult) = 0;
/**
* Signals to receive the end of an element.
@ -132,7 +132,7 @@ public:
const nsAString& aValue); \
virtual void characters(const nsAString& aData, PRBool aDOE); \
virtual void comment(const nsAString& aData); \
virtual void endDocument(); \
virtual void endDocument(nsresult aResult = NS_OK); \
virtual void endElement(const nsAString& aName, const PRInt32 aNsID); \
virtual void processingInstruction(const nsAString& aTarget, \
const nsAString& aData); \

2
extensions/transformiix/source/xslt/txXMLOutput.cpp
View File

@ -160,7 +160,7 @@ void txXMLOutput::comment(const nsAString& aData)
*mOut << endl;
}
void txXMLOutput::endDocument()
void txXMLOutput::endDocument(nsresult aResult)
{
}