From 79bf7a0a29de4cae7c5cdf26f494cdb00a8820a3 Mon Sep 17 00:00:00 2001 From: "jst%netscape.com" Date: Fri, 10 May 2002 18:21:50 +0000 Subject: [PATCH] Fixing bug 135278. Stop don't use Substring() on a null poiter, Substring() asserts if given a null pointer. r=dbaron@fas.harvard.edu, sr=jaggernaut@netscape.com git-svn-id: svn://10.0.0.236/trunk@121264 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsGenericDOMDataNode.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.cpp b/mozilla/content/base/src/nsGenericDOMDataNode.cpp index d9c399c3ed7..4c35bead99d 100644 --- a/mozilla/content/base/src/nsGenericDOMDataNode.cpp +++ b/mozilla/content/base/src/nsGenericDOMDataNode.cpp @@ -434,7 +434,12 @@ nsGenericDOMDataNode::GetData(nsAString& aData) // terminated strings. const char *data = mText.Get1b(); - CopyASCIItoUCS2(Substring(data, data + mText.GetLength()), aData); + + if (data) { + CopyASCIItoUCS2(Substring(data, data + mText.GetLength()), aData); + } else { + aData.Truncate(); + } } return NS_OK;