From ceb00ea625f00f2f7262e1388d31dd58c6ece2ba Mon Sep 17 00:00:00 2001 From: "jst%netscape.com" Date: Sun, 27 May 2001 07:15:28 +0000 Subject: [PATCH] Fixing regression bug 81818 that caused a crash in certain situations when viewing images in mozilla. sr=scc@mozilla.org, a=choffmann@netscape.com git-svn-id: svn://10.0.0.236/trunk@95971 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/document/src/nsImageDocument.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mozilla/content/html/document/src/nsImageDocument.cpp b/mozilla/content/html/document/src/nsImageDocument.cpp index 83c8157d3c0..6545e4315f0 100644 --- a/mozilla/content/html/document/src/nsImageDocument.cpp +++ b/mozilla/content/html/document/src/nsImageDocument.cpp @@ -498,15 +498,13 @@ nsresult nsImageDocument::UpdateTitle( void ) rv = bundle->FormatStringFromName(key.GetUnicode(), formatStrings, 2, getter_Copies(valUni)); } } - if (!valUni[0]) { + if (!valUni || !valUni[0]) { key.AssignWithConversion("ImageTitleWithoutDimensions"); rv = bundle->GetStringFromName(key.GetUnicode(), getter_Copies(valUni)); } if (NS_SUCCEEDED(rv) && valUni) { - nsString titleStr; - titleStr.Assign(valUni); // set it on the document - SetTitle(titleStr); + SetTitle(nsDependentString(valUni)); } } return NS_OK;