From 0e0b27bf8a35b6c85e25d8abe7191d1605940fdd Mon Sep 17 00:00:00 2001 From: "cst%andrew.cmu.edu" Date: Sat, 20 Aug 2005 22:47:10 +0000 Subject: [PATCH] Bug 305215 Fix crash going back while loading an image [@ ImageListener::OnStopRequest] (regression from bug 292503) patch by Frank Wein , r=biesi sr=jst git-svn-id: svn://10.0.0.236/trunk@178522 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/document/src/nsImageDocument.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mozilla/content/html/document/src/nsImageDocument.cpp b/mozilla/content/html/document/src/nsImageDocument.cpp index 0581b4d14bc..de4f3905cb3 100644 --- a/mozilla/content/html/document/src/nsImageDocument.cpp +++ b/mozilla/content/html/document/src/nsImageDocument.cpp @@ -221,15 +221,16 @@ ImageListener::OnStopRequest(nsIRequest* request, nsISupports *ctxt, } - if (NS_FAILED(status) && imgDoc->mStringBundle) { + // mImageContent can be null if the document is already destroyed + if (NS_FAILED(status) && imgDoc->mStringBundle && imgDoc->mImageContent) { nsCAutoString src; imgDoc->mDocumentURI->GetSpec(src); - NS_ConvertUTF8toUCS2 srcString(src); - const PRUnichar* formatString[1] = { srcString.get() }; + NS_ConvertUTF8toUTF16 srcString(src); + const PRUnichar* formatString[] = { srcString.get() }; nsXPIDLString errorMsg; NS_NAMED_LITERAL_STRING(str, "InvalidImage"); imgDoc->mStringBundle->FormatStringFromName(str.get(), formatString, 1, - getter_Copies(errorMsg)); + getter_Copies(errorMsg)); imgDoc->mImageContent->SetAttr(kNameSpaceID_None, nsHTMLAtoms::alt, errorMsg, PR_FALSE); }