From ec28beac4b3443cbdfa18ca353c0b63aa8cb52e8 Mon Sep 17 00:00:00 2001 From: "bratell%lysator.liu.se" Date: Thu, 27 Jul 2000 06:12:49 +0000 Subject: [PATCH] Final part of bug 40027. r,a=waterson@netscape.com git-svn-id: svn://10.0.0.236/trunk@74889 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/string/obsolete/nsString2.cpp | 2 +- mozilla/xpcom/ds/nsString2.cpp | 2 +- mozilla/xpcom/string/obsolete/nsString2.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp index 1e85b47def2..e65897a989c 100644 --- a/mozilla/string/obsolete/nsString2.cpp +++ b/mozilla/string/obsolete/nsString2.cpp @@ -784,7 +784,7 @@ char* nsString::ToCString(char* aBuf, PRUint32 aBufLength,PRUint32 anOffset) con CBufDescriptor theDescr(aBuf,PR_TRUE,aBufLength,0); nsCAutoString temp(theDescr); - nsStr::StrAssign(temp, *this, anOffset, aBufLength-1); + nsStr::StrAssign(temp, *this, anOffset, PR_MIN(mLength, aBufLength-1)); temp.mStr=0; } return aBuf; diff --git a/mozilla/xpcom/ds/nsString2.cpp b/mozilla/xpcom/ds/nsString2.cpp index 1e85b47def2..e65897a989c 100644 --- a/mozilla/xpcom/ds/nsString2.cpp +++ b/mozilla/xpcom/ds/nsString2.cpp @@ -784,7 +784,7 @@ char* nsString::ToCString(char* aBuf, PRUint32 aBufLength,PRUint32 anOffset) con CBufDescriptor theDescr(aBuf,PR_TRUE,aBufLength,0); nsCAutoString temp(theDescr); - nsStr::StrAssign(temp, *this, anOffset, aBufLength-1); + nsStr::StrAssign(temp, *this, anOffset, PR_MIN(mLength, aBufLength-1)); temp.mStr=0; } return aBuf; diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp index 1e85b47def2..e65897a989c 100644 --- a/mozilla/xpcom/string/obsolete/nsString2.cpp +++ b/mozilla/xpcom/string/obsolete/nsString2.cpp @@ -784,7 +784,7 @@ char* nsString::ToCString(char* aBuf, PRUint32 aBufLength,PRUint32 anOffset) con CBufDescriptor theDescr(aBuf,PR_TRUE,aBufLength,0); nsCAutoString temp(theDescr); - nsStr::StrAssign(temp, *this, anOffset, aBufLength-1); + nsStr::StrAssign(temp, *this, anOffset, PR_MIN(mLength, aBufLength-1)); temp.mStr=0; } return aBuf;